Tidy up messages; ensure errors to to stderr