Upkeep and model tweaks