Simple client tested, minor bug fixes.