reorganised logging with markers; more flexible data import