more libraries and changes