Cleaned up render code.  Refactored fancy fluids (but disable for time being).