various order fixes
build