more changes and camera setup