Work on the Dispersive upgrade, some fixes around for the sparks.