ready for submission
added comments and new empty exception; rfs
commented; rfs