move more stuff to config file