major refactor
tweaks
simplify todofooter
Merge pull request #13 from krawaller/master

major refactor