Mark quarry as beta. Other minor design improvements.

Change-Id: I4f9362582324368a646e0c2de7d2fc0e93eea5ba