Updated floorplan to be a bit more accurate.  Added pipe.
Some minor tweaking.