Added Simple CLI client and minor fixes