Add checkmarks etc
Wording changes
Fix merge conflict