ProcessWaterCannon bug and refractoring (#773) …
* fix audio bug and some refractoring * mark original bugs