lots of spa fixes