Did some stuff.

Honestly I can't tell you exactly what's happening here. Some things got
moved and some got edited.