Updated TODO's as well as commenting

Went through files and ensured that they are javadoc commented. Also
came across some errors and marked them with todo's.