Fixed a bunch of build and price issues