Included final mode 1 messages, edited error messages, minor comment cleanup