bugfixes and stability