Added setup file, changanged some things