Changes and fixes to the interface