A few fixes and some cleanup.  Compiles.