setup improvements