Many changes

Updates over the weekend.
also deleted these.