Tidying.
Messing with project settings to enable command-line running.
Some runtime consistency checks.
Tidying and commentary.
Merge branch 'feature/robust' into develop
Just some general tidying.
Merge branch 'develop'