A few fixes, updated spree