Added small client and minor improvements.