bugfixes and known issue