Fix comment, add some newlines to stderr writes
Merge branch 'dev'