more admin improvements and model tweaks