Bugfixes, improvements of framework.