Updated the build with new order and some quick fixes