Integrate build fix and better setup instructions

Integrate build fix and better setup instructions