more admin dev and model tweaks