minor source clean up and a few extra comments with TODOs