Config file + various cleanup