more awesome changes - nearly there with sorting out the sauce