Fixed stuff
Merge