Fixed up default conf with a few specifics and cleanup