repaired some setup problems