Small fixes.  First working.