Updates after initial testing.