Bugfixes and restoration of existing functionality