Many changes in aper from Steve Rodney.  A couple additional bug fixes