Config file & fixes