some realignment, updated deps