added water collisionrule and cleaned up and shaked out some bugs and glitches