landing page additions
merge joel with master