Bugfixing and feature enhancements