second commit, added fixes to camera spawning