Added notes and such