refactors and tmp watermark drop

temporarily dropping watermark, as a fix
in the testCoverage script surfaced low
test coverage... we knew this.. working on it

also refactoring the pubsub, breaking things
up a bit...

removed a un-necessary loop....

lots to do.... broad strokes