changed the logging and test
merged github stuff