fix client
add billing
merge client code