minor revisions to multple functions