fixes for new lines and copy & paste errors