updating a few errors from merge