fixed some typos
styling refinements
Merge branch 'bugs/style-and-typos' into development