fixes and speed ups!
latest changes.  1 test still failing when run as part of suite