fixes from the first round of testing'