Add code to allow arbitrary rotations instead of just flips
Fix issue with exact names overlapping with differing angles