more work on control and camera