Improvements and bugfixing