Fixed setup and config file