add Skill WaterRing
cleanup code
fix exception on first startup