Added notes, reviewed fixes