Added EXS client functionality and fixed some minor issues.