fixed stuff
Merging