fix some basic mistakes from merging