Fix water and improve beach scene