admin and model tweaks