Missed the -C flag

Also cleanup the main config