New improvements and bugfixes