Updated libraries, included more local versions