bug fixes, lame but working example client