Finished config loading

Also made a few minor changes