Edited a lot of stuff, fun fun joy joy.
Fixed merges.