Fix up some English and add in a more robust configuration framework