Many changes

Updates over the weekend.
Why not remove it?