code cleanups
updated libraries, code cleanups