todo and fixed things
Merge branch 'master' of https://github.com/rbryan/petulant-tribble