More prefabs and level polish