Town plan: Housing, hamlet upgrades