Final edits to fix interface bugs