copy tweaks
merging conflicts
fix css h2 and add google tracker