moved more stuff into config file