fixes from first round of testing