Add Comments and Colors
Fix a tiny bug in text display :bug: