Move more things into config file, add comments