fixed camera movement
merged changes