Corrected issue with newline wrapping, and added ++ tags around certain keywords.