week 7, and fix some config settings