Updates from prototype build and testing.