Further improvements and bugfixes