Merge pull request #1 from matthu7777/patch-1

add verbosity
tidy up client
tidy up client a bit more
Merge pull request #2 from nettux443/master

merge