More confoig changes from Jake's feedback document