first round of testing fixes