New features and bugfixing