client changes for 0.0.2 beta