Added erb percent
Tweak company mode and formatting