Added notes to self in comments