remove old commented code
comment email error reporting
Merge branch 'master' into dev
show newlines in comments