doing a little cleaup, adding some ToDo items;