some cleanup and todo updates