did all of #78s /undo improvements, except for @mainerrors lookback