Fixed stuff
Merged.