fixed some setup stuff, again