more bugfixes from previous ** broken pump demo