Moved more settings into config files
Added more comments