setup file improvements