fixing config files and small edits