Various

I will probably make more changes later or tomorrow, but I guess you can merge what I have so far.