Fixes #2 and corrects rotation storage issues