some setup improvements