lots of changes and fixes from windows pc
cleaned up unit tests, removed cruft routines
not sure why I need this commit