Bugfixes, improvements...