buggy movement of fluid
fixed dt error
merged branches