Added notes and other modifications