Added unit functionality; made search more forgiving; added new user initialization.