Correct animation speeds and do some work on water animations