moved more stuff to config, cleaned up things in general