cleaned up comments, and moved TODO's to github issues