Interface improvements and bugfixes