More minor revisions to the interface