Fixes and wire ups
Merge pull request #50 from lossyrob/client/fixes

Fixes and wire ups