Several bugfixes, 2 feature requests and more improvements