Lots of bug fixes.  Bugs with arrest output.