Config working and speed improvements