Misc revisions to interface.