Fixed rotation and loading bugs

Small bug fixes