Comment and small exit error code fixup