Typo fix in test
Comments and other nitpicking
Various exception handling cleanup