Update SETUP and README
Improve SETUP