current updates to library. all tests except last 2 pass
minor changes
all test pass