Various spa improvements and fixes