increased coverage, fixed some log messages