Feature enhancements and bugfixes