Bugfixes and improved responsiveness