updated libraries, small cleanup
updated libraries