Buggfixin & more configs