More notes, some cleanup