Interface update and bugfixes