landing page updates, etc
fixed merge conflicts