cleaned up camera parameters and a few misc fixes