cleaned up some permission issues and restricted user list to current org