OK.  Cleaned up code a lot.  Still to do: add "-" for missing entries