updated libraries
updated libraries, cleanup