misc rework