Fixed camera

Camera now moves properly
Also temporarily enabled the old "collision" system