most of the final changes for the site