fix some other funny bugs