Commit

Upgraded/fixed/added a bunch of things.