Clean up, plus adding interactions

I also took of the warnings from glm about deprecated calls for
rotation using angle in degree