updates to libraries

merge with forked project