Fixed a number of bugs with pricing due to using strings (Why?) but solved now