bring things back into order

no bad diffs just yet