Fix a bunch of ordering issues
changes? what changes?