Clean ups, getting ready to add pitch + yaw