fixed long error messages and added ability to include source files