Many changes

Updates over the weekend.