Readability

Updated a few Doc Blocks
Added some To Do's