Further refinements to spark-button

TBR