refactor some axis stuff, other minor changes