Misc mod's.  Checking in so I can work at home from repo.