Massive cleanup. Added... things.
Oh wow. I was busy.