client.rb arugments correction & general clean up