consistent error output, minor fixes