fix checkmarks
Merge branch 'chris'
Merge branch 'diego'