fixes some minor bugs, completes the add users to org script