More notes and tidying