More Changes to Prefabs

Getting rid of some stuff and making sure stuff works.