Mark answers, upgrades to lib and marking
Improve ui, add highlight, test data