wip descriptions
fix escaping
Merge branch 'descriptions'