update configuration items with erik's suggestions
fix typo
fix a few more typos..