More notes, cleanup