fixed misc TODOs
Merge branch 'master' of github.com:gregarious/dlcc-site
more misc. TODOs fixed