Fixed stuff, can't remember.
Merged.