exit nicely, and document more