Changed deleting users. Add minor changes.