two extra settings and a few fix