fix SunBeam and add WaterBeam