Just a bit of cleaning up
Small debugging mods
Merge branch 'develop-simpler' into gh-pages