Updated client to support non master run
Added ability to debug