bugfixes and more compatibility to other mods