bugfixes, new features in testing..