Some interface modifications and bugfixes.