Simplifications & optimizations.
String improvements.
Improve comment dialog behaviour.