few tweaks for rotation.  Going to try some major refactoring in a different branch.