Various tweaks
Merge branch 'master' of github.com:natcl/maxtoolbox