bugfixes & small enhancements