Adding more verbose notes and error checking