Override Text and Comment

Fixes #87
Fixes #88