Added notes and exit-handling