notes: mostly tidying covered material