fixed some setup things
fixed some setup things