get rid of vectorize!

- refactor axis stuff
- other minor changes