Further cleanup.  Fans now supported :-)