Interface and bug fixes