correct error message text
update reggression tests output
cleanup code
restructure header files reference
reformat, do source code more readable