fixed casing, improved vocabulary