fixes from initial testing