reorder, pedantry
fix axes swappage

Issue: #56