Silly comment modifications
Comments and more TODO
Added more procedures to test