bugfixes, still using local versions of admin/alert
bugfixes on routing