updated libraries, adapted code
updated libraries
updated libraries, adapted code, improved error reporting