Minor fixes and adding on the default.cfg for modes