Minor comment change
Misc

Relocated some of the code, moved some var decls into transform, added
some more blacklisted axes