Many bugfixes...