bugfixes, stability improvements