Bugfixes, JSON implementation of admin features, removal of dead code