fixes
changes to lib