Updated setup and README