minor changes in error outputs and includes