updated libraries
updated libraries, code cleanups