prepare for #30 and general cleanup
and adding multiple general and my (dr) TODOs
Merge branch 'develop' of https://github.com/WPAFC/afch into develop