Fixes made after first code review of rotation.