fix some errors from previous merging branches