diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
index a5c5e8c5f..dbe06a4e2 100644
--- a/appnetpost/appnetpost.php
+++ b/appnetpost/appnetpost.php
@@ -53,11 +53,11 @@ function appnetpost_settings(&$a,&$s) {
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<h3>' . t('App.net Post Settings') . '</h3>';
+	$s .= '<h3>' . t('App.net') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<h3>' . t('App.net Post Settings') . '</h3>';
+	$s .= '<h3>' . t('App.net') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="appnetpost-enable-wrapper">';
diff --git a/blockem/blockem.php b/blockem/blockem.php
index d77ece711..223a1990c 100755
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -50,11 +50,11 @@ function blockem_addon_settings(&$a,&$s) {
 		$words = '';
 
     $s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
-    $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '<h3>' . t('"Blockem"') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
-    $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '<h3>' . t('"Blockem"') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="blockem-wrapper">';
diff --git a/blogger/blogger.php b/blogger/blogger.php
index c75cebac1..8d60472cb 100755
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Blogger') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Blogger') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="blogger-enable-wrapper">';
diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php
index cbcf86a01..8a2f3d291 100755
--- a/communityhome/communityhome.php
+++ b/communityhome/communityhome.php
@@ -75,8 +75,8 @@ function communityhome_home(&$a, &$o){
 	// this query don't work on some mysql versions
 	if (get_config('communityhome','showactiveusers')===true){
 		$r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`  FROM
-				(SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
-				(SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
+				(SELECT COUNT(*) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
+				(SELECT COUNT(*) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
 				(
 				SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` 
 				UNION ALL 
diff --git a/convpath/convpath.php b/convpath/convpath.php
index e5dc0b367..950936942 100644
--- a/convpath/convpath.php
+++ b/convpath/convpath.php
@@ -10,12 +10,22 @@
 function convpath_install() {
 	register_hook('page_end', 'addon/convpath/convpath.php', 'convpath_page_end');
 	register_hook('page_header', 'addon/convpath/convpath.php', 'convpath_page_header');
+	register_hook('ping_xmlize',  'addon/convpath/convpath.php', 'convpath_ping_xmlize_hook');
+	register_hook('prepare_body', 'addon/convpath/convpath.php', 'convpath_prepare_body_hook');
+	register_hook('display_item', 'addon/convpath/convpath.php', 'convpath_display_item_hook');
 }
 
 
 function convpath_uninstall() {
 	unregister_hook('page_end', 'addon/convpath/convpath.php', 'convpath_page_end');
 	unregister_hook('page_header', 'addon/convpath/convpath.php', 'convpath_page_header');
+	unregister_hook('ping_xmlize',  'addon/convpath/convpath.php', 'convpath_ping_xmlize_hook');
+	unregister_hook('prepare_body', 'addon/convpath/convpath.php', 'convpath_prepare_body_hook');
+	unregister_hook('display_item', 'addon/convpath/convpath.php', 'convpath_display_item_hook');
+}
+
+function convpath_ping_xmlize_hook(&$a, &$o) {
+	$o["photo"] = convpath_url($a, $o["photo"]);
 }
 
 function convpath_page_header(&$a, &$o){
@@ -27,6 +37,42 @@ function convpath_page_end(&$a, &$o){
 	$a->page['aside'] = convpath_convert($a->page['aside']);
 }
 
+function convpath_prepare_body_hook(&$a, &$o) {
+	$o["html"] = convpath_convert($o["html"]);
+}
+
+function convpath_display_item_hook(&$a, &$o) {
+	if (isset($o["output"])) {
+		if (isset($o["output"]["thumb"]))
+			$o["output"]["thumb"] = convpath_url($a, $o["output"]["thumb"]);
+		if (isset($o["output"]["author-avatar"]))
+			$o["output"]["author-avatar"] = convpath_url($a, $o["output"]["author-avatar"]);
+		if (isset($o["output"]["owner-avatar"]))
+			$o["output"]["owner-avatar"] = convpath_url($a, $o["output"]["owner-avatar"]);
+		if (isset($o["output"]["owner_photo"]))
+			$o["output"]["owner_photo"] = convpath_url($a, $o["output"]["owner_photo"]);
+	}
+}
+
+function convpath_url($a, $path) {
+	if ($path == "")
+		return("");
+
+	$ssl = (substr($a->get_baseurl(), 0, 8) == "https://");
+
+	if ($ssl) {
+		$search = "http://".$a->get_hostname();
+		$replace = "https://".$a->get_hostname();
+	} else {
+		$search = "https://".$a->get_hostname();
+		$replace = "http://".$a->get_hostname();
+	}
+
+	$path = str_replace($search, $replace, $path);
+
+	return($path);
+}
+
 /*
 Converts a given path according to the current scheme
 */
diff --git a/curweather/curweather.php b/curweather/curweather.php
index bd0d6c750..67d5939e7 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -87,7 +87,7 @@ function curweather_plugin_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('Current Weather Settings') . '</h3>';
+	$s .= '<h3>' . t('Current Weather') . '</h3>';
 	$s .= '<div id="curweather-settings-wrapper">';
 	$s .= '<p>Find the location code for the airport/weather station nearest you <a href="http://en.wikipedia.org/wiki/International_Air_Transport_Association_airport_code" target="_blank">here</a>.</p>';
 	$s .= '<label id="curweather-location-label" for="curweather_loc">' . t('Weather Location: ') . '</label>';
diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index b26d3ee3a..cb7a13cc7 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -7,40 +7,40 @@
 class Diasphp {
 	function __construct($pod) {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';
-		
+
 		$this->pod = $pod;
 		$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies');
 	}
 
 	function _fetch_token() {
 		$ch = curl_init();
-		
+
 		curl_setopt ($ch, CURLOPT_URL, $this->pod . "/stream");
 		curl_setopt ($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
 		curl_setopt ($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
 		curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
-		
+
 		$output = curl_exec ($ch);
 		curl_close($ch);
-		
+
 		// Token holen und zurückgeben
 		preg_match($this->token_regex, $output, $matches);
 		return $matches[1];
 	}
-	
+
 	function login($username, $password) {
 		$datatopost = array(
 			'user[username]' => $username,
 			'user[password]' => $password,
 			'authenticity_token' => $this->_fetch_token()
 		);
-		
+
 		$poststr = http_build_query($datatopost);
-		
+
 		// Adresse per cURL abrufen
 		$ch = curl_init();
-		
+
 		curl_setopt ($ch, CURLOPT_URL, $this->pod . "/users/sign_in");
 		curl_setopt ($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
 		curl_setopt ($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
@@ -48,11 +48,11 @@ class Diasphp {
 		curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt ($ch, CURLOPT_POST, true);
 		curl_setopt ($ch, CURLOPT_POSTFIELDS, $poststr);
-		
+
 		curl_exec ($ch);
 		$info = curl_getinfo($ch);
 		curl_close($ch);
-		
+
 		if($info['http_code'] != 302) {
 			throw new Exception('Login error '.print_r($info, true));
 		}
@@ -60,24 +60,24 @@ class Diasphp {
 		// Das Objekt zurückgeben, damit man Aurufe verketten kann.
 		return $this;
 	}
-	
+
 	function post($text) {
 		// post-daten vorbereiten
 		$datatopost = json_encode(array(
 				'aspect_ids' => 'public',
 				'status_message' => array('text' => $text)
 		));
-		
+
 		// header vorbereiten
 		$headers = array(
 			'Content-Type: application/json',
 			'accept: application/json',
 			'x-csrf-token: '.$this->_fetch_token()
 		);
-		
+
 		// Adresse per cURL abrufen
 		$ch = curl_init();
-		
+
 		curl_setopt ($ch, CURLOPT_URL, $this->pod . "/status_messages");
 		curl_setopt ($ch, CURLOPT_COOKIEFILE, $this->cookiejar);
 		curl_setopt ($ch, CURLOPT_COOKIEJAR, $this->cookiejar);
@@ -86,15 +86,15 @@ class Diasphp {
 		curl_setopt ($ch, CURLOPT_POST, true);
 		curl_setopt ($ch, CURLOPT_POSTFIELDS, $datatopost);
 		curl_setopt ($ch, CURLOPT_HTTPHEADER, $headers);
-		
+
 		curl_exec ($ch);
 		$info = curl_getinfo($ch);
 		curl_close($ch);
-		
+
 		if($info['http_code'] != 201) {
 			throw new Exception('Post error '.print_r($info, true));
 		}
-		
+
 		// Ende der möglichen Kette, gib mal "true" zurück.
 		return true;
 	}
diff --git a/facebook/facebook.php b/facebook/facebook.php
index ff9b52ea2..1ec97bc22 100644
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -289,7 +289,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
                                         `name-date` = '%s',
                                         `uri-date` = '%s',
                                         `avatar-date` = '%s'
-                                        WHERE `id` = %d LIMIT 1
+                                        WHERE `id` = %d
                                 ",
                 dbesc($photos[0]),
                 dbesc($photos[1]),
@@ -356,7 +356,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
                         `name-date` = '%s',
                         `uri-date` = '%s',
                         `avatar-date` = '%s'
-                        WHERE `id` = %d LIMIT 1
+                        WHERE `id` = %d
                 ",
         dbesc($photos[0]),
         dbesc($photos[1]),
@@ -742,19 +742,19 @@ function facebook_plugin_admin(&$a, &$o){
 
 
 	$o = '<input type="hidden" name="form_security_token" value="' . get_form_security_token("fbsave") . '">';
-	
+
 	$o .= '<h4>' . t('Facebook API Key') . '</h4>';
-	
+
 	$appid  = get_config('facebook', 'appid'  );
 	$appsecret = get_config('facebook', 'appsecret' );
 	$poll_interval = get_config('facebook', 'poll_interval' );
 	$sync_comments = get_config('facebook', 'sync_comments' );
 	if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
-	
+
 	$ret1 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appid' LIMIT 1");
 	$ret2 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appsecret' LIMIT 1");
 	if ((count($ret1) > 0 && $ret1[0]['v'] != $appid) || (count($ret2) > 0 && $ret2[0]['v'] != $appsecret)) $o .= t('Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>');
-	
+
 	$working_connection = false;
 	if ($appid && $appsecret) {
 		$subs = facebook_subscriptions_get();
@@ -764,7 +764,7 @@ function facebook_plugin_admin(&$a, &$o){
 			$working_connection = true;
 		} else $o .= t('The correctness of the API Key could not be detected. Something strange\'s going on.') . '<br>';
 	}
-	
+
 	$o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input id="fb_appid" name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">';
 	$o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input id="fb_appsecret" name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">';
 	$o .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval in minutes (minimum %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" id="fb_poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">';
@@ -1171,7 +1171,7 @@ function facebook_post_hook(&$a,&$b) {
 
 					$retj = json_decode($x);
 					if($retj->id) {
-						q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+						q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
 							dbesc('fb::' . $retj->id),
 							intval($b['id'])
 						);
@@ -1183,14 +1183,14 @@ function facebook_post_hook(&$a,&$b) {
 							add_to_queue($a->contact,NETWORK_FACEBOOK,$s);
 							notice( t('Facebook post failed. Queued for retry.') . EOL);
 						}
-						
+
 						if (isset($retj->error) && $retj->error->type == "OAuthException" && $retj->error->code == 190) {
 							logger('Facebook session has expired due to changed password.', LOGGER_DEBUG);
-							
+
 							$last_notification = get_pconfig($b['uid'], 'facebook', 'session_expired_mailsent');
 							if (!$last_notification || $last_notification < (time() - FACEBOOK_SESSION_ERR_NOTIFICATION_INTERVAL)) {
 								require_once('include/enotify.php');
-							
+
 								$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) );
 								notification(array(
 									'uid' => $b['uid'],
@@ -1203,7 +1203,7 @@ function facebook_post_hook(&$a,&$b) {
 									'source_link'  => $a->config["system"]["url"],
 									'source_photo' => $a->config["system"]["url"] . '/images/person-80.jpg',
 								));
-								
+
 								set_pconfig($b['uid'], 'facebook', 'session_expired_mailsent', time());
 							} else logger('Facebook: No notification, as the last one was sent on ' . $last_notification, LOGGER_DEBUG);
 						}
@@ -1307,11 +1307,11 @@ function fb_queue_hook(&$a,&$b) {
 
 				$retj = json_decode($j);
 				if($retj->id) {
-					q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+					q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
 						dbesc('fb::' . $retj->id),
 						intval($item)
 					);
-					logger('facebook_queue: success: ' . $j); 
+					logger('facebook_queue: success: ' . $j);
 					remove_queue_item($x['id']);
 				}
 				else {
diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 3b064a56a..db905a157 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -207,7 +207,7 @@ function fbpost_content(&$a) {
 	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
 		. $a->get_baseurl() . '/addon/fbpost/fbpost.css' . '" media="all" />' . "\r\n";
 
-	$o .= '<h3>' . t('Facebook Post') . '</h3>';
+	$o .= '<h3>' . t('Facebook') . '</h3>';
 
 	if(! $fb_installed) {
 		$o .= '<div id="fbpost-enable-wrapper">';
@@ -293,8 +293,7 @@ function fbpost_content(&$a) {
 function fbpost_plugin_settings(&$a,&$b) {
 
 	$b .= '<div class="settings-block">';
-	//$b .= '<h3>' . t('Facebook Post Settings') . '</h3>';
-	$b .= '<a href="fbpost"><h3>' . t('Facebook Post Settings') . '</a></h3>';
+	$b .= '<a href="fbpost"><h3>' . t('Facebook') . '</a></h3>';
 	$b .= '</div>';
 
 }
@@ -1173,7 +1172,7 @@ function fbpost_get_photo($uid,$link) {
 
 function fpost_cleanpicture($image) {
 
-	if (strpos($image, ".fbcdn.net/") and (substr($image, -6) == "_s.jpg"))
+	if ((strpos($image, ".fbcdn.net/") OR strpos($image, "/fbcdn-photos-")) and (substr($image, -6) == "_s.jpg"))
 		$image = substr($image, 0, -6)."_n.jpg";
 
 	$queryvar = fbpost_parse_query($image);
diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index ee70481c0..e69cd2c0c 100644
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -120,11 +120,11 @@ function fbsync_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
-	$s .= '<h3>' . t('Facebook Import Settings') . '</h3>';
+	$s .= '<h3>' . t('Facebook Import') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
-	$s .= '<h3>' . t('Facebook Import Settings') . '</h3>';
+	$s .= '<h3>' . t('Facebook Import') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="fbsync-enable-wrapper">';
diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 50fc0a5ca..61a20c71b 100644
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@@ -158,11 +158,11 @@ function forumlist_plugin_settings(&$a,&$s) {
 
 	/* Add some HTML to the existing form */
 	$s .= '<span id="settings_forumlist_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
-	$s .= '<h3>' . t('Forumlist Settings') . '</h3>';
+	$s .= '<h3>' . t('Forumlist') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_forumlist_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
-	$s .= '<h3>' . t('Forumlist Settings') . '</h3>';
+	$s .= '<h3>' . t('Forumlist') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="forumlist-settings-wrapper">';
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 343edae7c..ecdf76569 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -34,11 +34,11 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$account = get_pconfig(local_user(),'fromgplus','account');
 
 	$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '<h3>' . t('Google+ Mirroring').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '<h3>' . t('Google+ Mirroring').'</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="fromgplus-wrapper">';
diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index a66e1e45f..c6f2b2ebe 100644
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -59,11 +59,11 @@ function gpluspost_settings(&$a,&$s) {
 	$skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
-	$s .= '<h3>' . t('Google+ Post Settings') . '</h3>';
+	$s .= '<h3>' . t('Google+') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
-	$s .= '<h3>' . t('Google+ Post Settings') . '</h3>';
+	$s .= '<h3>' . t('Google+') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="gpluspost-enable-wrapper">';
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 15cbb80c0..f998acd13 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -295,11 +295,11 @@ function jappixmini_settings(&$a, &$s) {
     }
 
     $s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-    $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
+    $s .= '<h3>'.t('Jappix Mini').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-    $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
+    $s .= '<h3>'.t('Jappix Mini').'</h3>';
     $s .= '</span>';
 
     $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 1a19b1ddb..dec85ddb9 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '<h3>' . t('libertree') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '<h3>' . t('libertree') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="libertree-enable-wrapper">';
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index d8a5926b7..8e8c44c59 100755
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -75,11 +75,11 @@ function nsfw_addon_settings(&$a,&$s) {
 		$words = 'nsfw,';
 
     $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="nsfw-wrapper">';
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 8dacc9166..7d8b81365 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -36,7 +36,7 @@ function public_server_register_account($a,$b) {
 	if(! $days)
 		return;
 
-	$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d limit 1",
+	$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
 		dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
 		intval($days_posts),
 		intval($uid)
@@ -66,7 +66,7 @@ function public_server_cron($a,$b) {
 				'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
 			));
 
-			q("update user set expire_notification_sent = '%s' where uid = %d limit 1",
+			q("update user set expire_notification_sent = '%s' where uid = %d",
 				dbesc(datetime_convert()),
 				intval($rr['uid'])
 			);
@@ -85,7 +85,7 @@ function public_server_cron($a,$b) {
 		$r = q("select uid from user where account_expired = 0 and login_date = '0000-00-00 00:00:00' and register_date <  UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00'",intval($nologin));
 		if(count($r)) {
 			foreach($r as $rr)
-				q("update user set account_expires_on = '%s' where uid = %d limit 1",
+				q("update user set account_expires_on = '%s' where uid = %d",
 					dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
 					intval($rr['uid'])
 			);
@@ -98,7 +98,7 @@ function public_server_cron($a,$b) {
 		$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and `page-flags` = 0",intval($flagusers));
 		if(count($r)) {
 			foreach($r as $rr)
-				q("update user set account_expires_on = '%s' where uid = %d limit 1",
+				q("update user set account_expires_on = '%s' where uid = %d",
 					dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
 					intval($rr['uid'])
 				);
@@ -111,7 +111,7 @@ function public_server_cron($a,$b) {
 		$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
 		if(count($r)) {
 			foreach($r as $rr)
-				q("update user set expire = %d where uid = %d limit 1",
+				q("update user set expire = %d where uid = %d",
 					intval($flagpostsexpire),
 					intval($rr['uid'])
 				);
@@ -136,7 +136,7 @@ function public_server_login($a,$b) {
 	$days = get_config('public_server','expiredays');
 	if(! $days)
 		return;
-	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00' limit 1",
+	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
 	dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
 	local_user()
 	);
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index ac28a00da..0280b5170 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Pump.io') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Pump.io') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="pumpio-username-wrapper">';
@@ -1022,6 +1022,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
 
 function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) {
 	require_once('include/items.php');
+	require_once('include/html2bbcode.php');
 
 	if (($post->verb == "like") OR ($post->verb == "favorite"))
 		return pumpio_dolike($a, $uid, $self, $post, $own_id);
diff --git a/snautofollow/snautofollow.php b/snautofollow/snautofollow.php
index 4afb87068..ca19d6503 100644
--- a/snautofollow/snautofollow.php
+++ b/snautofollow/snautofollow.php
@@ -53,11 +53,11 @@ function snautofollow_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_snautofollow_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
-	$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>';
+	$s .= '<h3>' . t('StatusNet AutoFollow') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_snautofollow_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
-	$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>';
+	$s .= '<h3>' . t('StatusNet AutoFollow') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="snautofollow-wrapper">';
diff --git a/startpage/startpage.php b/startpage/startpage.php
index 6c266ca82..e0d822ac2 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -80,11 +80,11 @@ function startpage_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_startpage_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
-	$s .= '<h3>' . t('Startpage Settings') . '</h3>';
+	$s .= '<h3>' . t('Startpage') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_startpage_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
-	$s .= '<h3>' . t('Startpage Settings') . '</h3>';
+	$s .= '<h3>' . t('Startpage') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="startpage-page-wrapper">';
 	$s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login  - leave blank for profile wall') . '</label>';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index a159e87ad..d4120aaf9 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -155,7 +155,7 @@ function statusnet_settings_post ($a,$post) {
 	    return;
 	// don't check statusnet settings if statusnet submit button is not clicked
 	if (!x($_POST,'statusnet-submit')) return;
-	
+
 	if (isset($_POST['statusnet-disconnect'])) {
             /***
              * if the statusnet-disconnect checkbox is set, clear the statusnet configuration
@@ -279,11 +279,11 @@ function statusnet_settings(&$a,&$s) {
 	$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
+	$s .= '<h3>'. t('StatusNet').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
+	$s .= '<h3>'. t('StatusNet').'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 968aa8341..eff149d32 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -41,13 +41,13 @@ function testdrive_register_account($a,$b) {
 	if(! $days)
 		return;
 
-	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d limit 1",
+	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
 		dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
 		intval($uid)
 	);
 
 };
-	
+
 
 function testdrive_cron($a,$b) {
 	require_once('include/enotify.php');
@@ -69,11 +69,11 @@ function testdrive_cron($a,$b) {
 				'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
 			));
 
-			q("update user set expire_notification_sent = '%s' where uid = %d limit 1",
+			q("update user set expire_notification_sent = '%s' where uid = %d",
 				dbesc(datetime_convert()),
 				intval($rr['uid'])
 			);
- 
+
 		}
 	}
 
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 0102d6334..114fcc5b2 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Tumblr') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Tumblr') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 711a33fe0..aeae1c2f5 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -231,11 +231,11 @@ function twitter_settings(&$a,&$s) {
         $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<h3>'. t('Twitter Settings') .'</h3>';
+	$s .= '<h3>'. t('Twitter') .'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<h3>'. t('Twitter Settings') .'</h3>';
+	$s .= '<h3>'. t('Twitter') .'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 4c862151e..3c7c17b10 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '<h3>' . t('WordPress') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '<h3>' . t('WordPress') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
diff --git a/yourls/yourls.php b/yourls/yourls.php
index 1d781058f..beea2619c 100755
--- a/yourls/yourls.php
+++ b/yourls/yourls.php
@@ -52,11 +52,11 @@ function yourls_addon_settings(&$a,&$s) {
 	$yourls_ssl = get_config('yourls', 'ssl1');
 
 	$s .= '<span id="settings_yourls_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
-	$s .= '<h3>' . t('YourLS Settings') . '</h3>';
+	$s .= '<h3>' . t('YourLS') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_yourls_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
-	$s .= '<h3>' . t('YourLS Settings') . '</h3>';
+	$s .= '<h3>' . t('YourLS') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="yourls-url-wrapper">';