Max's notes, comments and cleanup