Better camera, and bug fix in collision map