Move To Dos to TODO
Cleanup configuration & WUG URI