Updated libraries, minor bug fixes