bugfixes, more features