Small polish and fixes on sparks.