fixed up some small bugs from merge conflict