various small bugfixes
various small bugfixes

artemeon/core,artemeon/core,jinshana/kajonacms,kajona/kajonacms,jinshana/kajonacms,kajona/kajonacms,artemeon/core,artemeon/core,jinshana/kajonacms,kajona/kajonacms,jinshana/kajonacms,kajona/kajonacms,artemeon/core,jinshana/kajonacms,jinshana/kajonacms