Cleaned up comments and 'echo mistakes