Reverting some bad changes to how axes are defined
Little boxplot fixes
Fixing merge conflicts