improvements of logging, testing, data