Your proposed modifications sound okay, not sure what you mean about fixing the movement system. The camera is supposed to follow the player around like a third person camera. If you mean to make the camera sit in a single place instead keep in mind you will have to design your levels around a stationary camera.