Changes based on UAT

Refined setup instructions and fixed dependency issue