bug fixes for cmd google & server