fixing more stuff
merging