logging, some junit tests
refactored config
top-level collecting measurements
cleanup