Some Cleanup and improved 2D Fluid Rendering