Comments and cleanup
Merge branch 'master' of https://github.com/j-bischof/tweb-project1