moved more stuff to config file.