general cleanup and adding a few notes.