fixes
better usage of the lib