Config from file added, misc changes