Bunch'o'fixes

See commit messages for details, this addresses the following bugs:

#587 #586 #584 #578

Also adds units to axis displays.