admin controller and small tweaks