Massive Updates

Ignore me, good luck making sense. it'll get smaller soon enough.