Many changes that should mostly complete the site