xfind exceptions
minor changes