updated some files to work better for setup
updated some files to work better for setup