bugfixes, more features, bunch of stuff