logging clean-up, field size improvements