diff --git a/_config.yml b/_config.yml
index 7e6c6cc..176dcf1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,7 +1,7 @@
 # Site settings
 title: Jim Myhrberg (jimeh)
-name: Jim Myhrberg
-nickname: jimeh
+person_name: Jim Myhrberg
+person_nickname: jimeh
 email: pbagnpg\100wvzru\056zr
 mailto: "mailto:%63%6s%6r%74%61%63%74@%6n%69%6q%65%68.%6q%65"
 description: Crazy-Ass Software Engineering Mercenary
@@ -9,6 +9,7 @@ baseurl: "" # the subpath of your site, e.g. /blog/
 hostname: jimeh.me # used to determine if google analytics should be triggered
 url: http://jimeh.me # the base hostname & protocol for your site
 permalink: /:title/
+
 blog_url: https://jimeh.io/
 cv_url: http://assets.jimeh.me/jim-myhrberg-cv.pdf
 vcard_url: http://assets.jimeh.me/jim-myhrberg.vcf
diff --git a/_includes/head.html b/_includes/head.html
index 8988cb6..2beb687 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -2,13 +2,11 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-
   <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
   <link rel="shortcut icon" href="/favicon.ico" />
   <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
-  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+  <meta name="description" content="{{ site.title }} - {{ site.description }}">
   <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:700,300|Open+Sans:400italic,700italic,400,700' rel='stylesheet' type='text/css'>
   <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
 </head>
diff --git a/index.html b/index.html
index 2fc76a1..b7407cf 100644
--- a/index.html
+++ b/index.html
@@ -6,8 +6,8 @@ layout: default
     <img class="site-avatar" src="{{ "/img/jimeh-4.0.jpg" | prepend: site.baseurl }}">
     <span class="content">
       <span class="site-title">
-        <span class="site-name">{{ site.name }}</span>
-        <span class="site-nickname">({{ site.nickname }})</span>
+        <span class="site-name">{{ site.person_name }}</span>
+        <span class="site-nickname">({{ site.person_nickname }})</span>
         <span class="site-description">{{ site.description }}</span>
       </span>
       <div class="site-links">