changes to interface and bug fixes