updates @TODOs for widget
Merge branches 'develop' and 'master'