fixed error message display
started on testing use of rake test test_file
about to add tests
fixed merge conflicts