Minor display mods
Implement new features
Add number, capitalized and hyphen features