Features not needed for resubmission, but nice for keeping this tool usable.