Many MANY updates.

Sorry this went so long without an update.