cleanup and rearrangement
robbie's suggestion on axis priority
planning parameters
various