added quiver + contourf animation, cleaned up code