more setup improvements