Name change.  :hi works again.
Various fixes and improvements.