Add and update doc strings, Tidy a few lines
Update names of some widgets
Add items to TODO