fixed more stuff
merging all day