Large update for several things.