javadocs for client
merge fixes