attempted exception handling, reduced maximum number of candidates, tweaked styling
Merge branch 'dev'