Misc. Updates to everything.

Needs more optimization... but it's getting there.