improved comments, corrections to exceptions