More notes and reorganization