finished window, added water collision detection