updates to spree 2.0