fixes to new criteria and UI