katrins changes; update on statistics report + unittests