diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index c424de5..b38c616 100644
Binary files a/cms/data/content.sqlite and b/cms/data/content.sqlite differ
diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite
index 80cff56..cd117fb 100644
Binary files a/cms/data/userdata.sqlite and b/cms/data/userdata.sqlite differ
diff --git a/cms/includes/page_types/rss.php b/cms/includes/page_types/rss.php
index 5c3e0b5..5533f4c 100644
--- a/cms/includes/page_types/rss.php
+++ b/cms/includes/page_types/rss.php
@@ -68,7 +68,7 @@ while($rss_data = $dbr->fetch())
   $i++;
  }
 
-$template->assign('wfw', $wfw);
+if(isset($wfw)) $template->assign('wfw', $wfw);
 if(isset($rss_items)) $template->assign('rss_items', $rss_items);
 
 $content_type = 'text/xml';
diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl
index 0da1387..1fb0049 100644
--- a/cms/templates/default.tpl
+++ b/cms/templates/default.tpl
@@ -4,8 +4,8 @@
 <meta charset="<?php echo $lang['charset']; ?>" />
 <title><?php if($page_title): ?><?php echo $page_title; ?><?php else: ?><?php if($title): ?><?php echo $title; ?> - <?php endif; ?><?php echo $settings['website_title']; ?><?php endif; ?></title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="">
-<meta name="author" content="">
+<meta name="description" content="<?php if($description) echo $description; else echo $settings['default_description']; ?>" />
+<meta name="keywords" content="<?php if($keywords) echo $keywords; else echo $settings['default_keywords']; ?>" />
 <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
 <link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
 <link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">