Fixed handling of quotes.
Added critera-completions.