Lots of bug fixes with library access