3rd party library support. Bugfixes.