fix encumbrance & cut down on log clutter