diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php
index 98aaf45d..9cd0efb6 100644
--- a/ext/numeric_score/main.php
+++ b/ext/numeric_score/main.php
@@ -38,7 +38,7 @@ class NumericScore extends Extension {
 
 	public function onUserPageBuilding(UserPageBuildingEvent $event) {
 		global $page, $user;
-		if($user->can("edit_other_votes")) {
+		if($user->can("edit_other_vote")) {
 			$html = $this->theme->get_nuller_html($event->display_user);
 			$page->add_block(new Block("Votes", $html, "main", 60));
 		}
diff --git a/ext/user/main.php b/ext/user/main.php
index 4e98de69..0c67ca0e 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -203,7 +203,15 @@ class UserPage extends Extension {
 		$event->add_stats("Joined: $h_join_date", 10);
 
 		$av = $event->display_user->get_avatar_html();
-		if($av) $event->add_stats($av, 0);
+		if($av) {
+			$event->add_stats($av, 0);
+		}
+		else if((
+			$config->get_string("avatar_host") == "gravatar") &&
+			($user->id == $event->display_user->id)
+		) {
+			$event->add_stats("No avatar? This gallery uses <a href='http://gravatar.com'>Gravatar</a> for avatar hosting, use the same email address here and there to have your avatar synced", 0);
+		}
 
 		ksort($event->stats);
 		$this->theme->display_user_page($event->display_user, $event->stats);
diff --git a/ext/simpletest/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/lib/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
similarity index 100%
rename from ext/simpletest/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
rename to lib/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
diff --git a/ext/simpletest/simpletest/LICENSE b/lib/simpletest/LICENSE
similarity index 100%
rename from ext/simpletest/simpletest/LICENSE
rename to lib/simpletest/LICENSE
diff --git a/ext/simpletest/simpletest/README b/lib/simpletest/README
similarity index 100%
rename from ext/simpletest/simpletest/README
rename to lib/simpletest/README
diff --git a/ext/simpletest/simpletest/VERSION b/lib/simpletest/VERSION
similarity index 100%
rename from ext/simpletest/simpletest/VERSION
rename to lib/simpletest/VERSION
diff --git a/ext/simpletest/simpletest/arguments.php b/lib/simpletest/arguments.php
similarity index 100%
rename from ext/simpletest/simpletest/arguments.php
rename to lib/simpletest/arguments.php
diff --git a/ext/simpletest/simpletest/authentication.php b/lib/simpletest/authentication.php
similarity index 100%
rename from ext/simpletest/simpletest/authentication.php
rename to lib/simpletest/authentication.php
diff --git a/ext/simpletest/simpletest/autorun.php b/lib/simpletest/autorun.php
similarity index 100%
rename from ext/simpletest/simpletest/autorun.php
rename to lib/simpletest/autorun.php
diff --git a/ext/simpletest/simpletest/browser.php b/lib/simpletest/browser.php
similarity index 100%
rename from ext/simpletest/simpletest/browser.php
rename to lib/simpletest/browser.php
diff --git a/ext/simpletest/simpletest/collector.php b/lib/simpletest/collector.php
similarity index 100%
rename from ext/simpletest/simpletest/collector.php
rename to lib/simpletest/collector.php
diff --git a/ext/simpletest/simpletest/compatibility.php b/lib/simpletest/compatibility.php
similarity index 100%
rename from ext/simpletest/simpletest/compatibility.php
rename to lib/simpletest/compatibility.php
diff --git a/ext/simpletest/simpletest/cookies.php b/lib/simpletest/cookies.php
similarity index 100%
rename from ext/simpletest/simpletest/cookies.php
rename to lib/simpletest/cookies.php
diff --git a/ext/simpletest/simpletest/default_reporter.php b/lib/simpletest/default_reporter.php
similarity index 100%
rename from ext/simpletest/simpletest/default_reporter.php
rename to lib/simpletest/default_reporter.php
diff --git a/ext/simpletest/simpletest/detached.php b/lib/simpletest/detached.php
similarity index 100%
rename from ext/simpletest/simpletest/detached.php
rename to lib/simpletest/detached.php
diff --git a/ext/simpletest/simpletest/dumper.php b/lib/simpletest/dumper.php
similarity index 100%
rename from ext/simpletest/simpletest/dumper.php
rename to lib/simpletest/dumper.php
diff --git a/ext/simpletest/simpletest/eclipse.php b/lib/simpletest/eclipse.php
similarity index 100%
rename from ext/simpletest/simpletest/eclipse.php
rename to lib/simpletest/eclipse.php
diff --git a/ext/simpletest/simpletest/encoding.php b/lib/simpletest/encoding.php
similarity index 100%
rename from ext/simpletest/simpletest/encoding.php
rename to lib/simpletest/encoding.php
diff --git a/ext/simpletest/simpletest/errors.php b/lib/simpletest/errors.php
similarity index 100%
rename from ext/simpletest/simpletest/errors.php
rename to lib/simpletest/errors.php
diff --git a/ext/simpletest/simpletest/exceptions.php b/lib/simpletest/exceptions.php
similarity index 100%
rename from ext/simpletest/simpletest/exceptions.php
rename to lib/simpletest/exceptions.php
diff --git a/ext/simpletest/simpletest/expectation.php b/lib/simpletest/expectation.php
similarity index 100%
rename from ext/simpletest/simpletest/expectation.php
rename to lib/simpletest/expectation.php
diff --git a/ext/simpletest/simpletest/extensions/pear_test_case.php b/lib/simpletest/extensions/pear_test_case.php
similarity index 100%
rename from ext/simpletest/simpletest/extensions/pear_test_case.php
rename to lib/simpletest/extensions/pear_test_case.php
diff --git a/ext/simpletest/simpletest/extensions/testdox.php b/lib/simpletest/extensions/testdox.php
similarity index 100%
rename from ext/simpletest/simpletest/extensions/testdox.php
rename to lib/simpletest/extensions/testdox.php
diff --git a/ext/simpletest/simpletest/extensions/testdox/test.php b/lib/simpletest/extensions/testdox/test.php
similarity index 100%
rename from ext/simpletest/simpletest/extensions/testdox/test.php
rename to lib/simpletest/extensions/testdox/test.php
diff --git a/ext/simpletest/simpletest/form.php b/lib/simpletest/form.php
similarity index 100%
rename from ext/simpletest/simpletest/form.php
rename to lib/simpletest/form.php
diff --git a/ext/simpletest/simpletest/frames.php b/lib/simpletest/frames.php
similarity index 100%
rename from ext/simpletest/simpletest/frames.php
rename to lib/simpletest/frames.php
diff --git a/ext/simpletest/simpletest/http.php b/lib/simpletest/http.php
similarity index 100%
rename from ext/simpletest/simpletest/http.php
rename to lib/simpletest/http.php
diff --git a/ext/simpletest/simpletest/invoker.php b/lib/simpletest/invoker.php
similarity index 100%
rename from ext/simpletest/simpletest/invoker.php
rename to lib/simpletest/invoker.php
diff --git a/ext/simpletest/simpletest/mock_objects.php b/lib/simpletest/mock_objects.php
similarity index 100%
rename from ext/simpletest/simpletest/mock_objects.php
rename to lib/simpletest/mock_objects.php
diff --git a/ext/simpletest/simpletest/page.php b/lib/simpletest/page.php
similarity index 100%
rename from ext/simpletest/simpletest/page.php
rename to lib/simpletest/page.php
diff --git a/ext/simpletest/simpletest/php_parser.php b/lib/simpletest/php_parser.php
similarity index 100%
rename from ext/simpletest/simpletest/php_parser.php
rename to lib/simpletest/php_parser.php
diff --git a/ext/simpletest/simpletest/recorder.php b/lib/simpletest/recorder.php
similarity index 100%
rename from ext/simpletest/simpletest/recorder.php
rename to lib/simpletest/recorder.php
diff --git a/ext/simpletest/simpletest/reflection_php4.php b/lib/simpletest/reflection_php4.php
similarity index 100%
rename from ext/simpletest/simpletest/reflection_php4.php
rename to lib/simpletest/reflection_php4.php
diff --git a/ext/simpletest/simpletest/reflection_php5.php b/lib/simpletest/reflection_php5.php
similarity index 100%
rename from ext/simpletest/simpletest/reflection_php5.php
rename to lib/simpletest/reflection_php5.php
diff --git a/ext/simpletest/simpletest/remote.php b/lib/simpletest/remote.php
similarity index 100%
rename from ext/simpletest/simpletest/remote.php
rename to lib/simpletest/remote.php
diff --git a/ext/simpletest/simpletest/reporter.php b/lib/simpletest/reporter.php
similarity index 100%
rename from ext/simpletest/simpletest/reporter.php
rename to lib/simpletest/reporter.php
diff --git a/ext/simpletest/simpletest/scorer.php b/lib/simpletest/scorer.php
similarity index 100%
rename from ext/simpletest/simpletest/scorer.php
rename to lib/simpletest/scorer.php
diff --git a/ext/simpletest/simpletest/selector.php b/lib/simpletest/selector.php
similarity index 100%
rename from ext/simpletest/simpletest/selector.php
rename to lib/simpletest/selector.php
diff --git a/ext/simpletest/simpletest/shell_tester.php b/lib/simpletest/shell_tester.php
similarity index 100%
rename from ext/simpletest/simpletest/shell_tester.php
rename to lib/simpletest/shell_tester.php
diff --git a/ext/simpletest/simpletest/simpletest.php b/lib/simpletest/simpletest.php
similarity index 100%
rename from ext/simpletest/simpletest/simpletest.php
rename to lib/simpletest/simpletest.php
diff --git a/ext/simpletest/simpletest/socket.php b/lib/simpletest/socket.php
similarity index 100%
rename from ext/simpletest/simpletest/socket.php
rename to lib/simpletest/socket.php
diff --git a/ext/simpletest/simpletest/tag.php b/lib/simpletest/tag.php
similarity index 100%
rename from ext/simpletest/simpletest/tag.php
rename to lib/simpletest/tag.php
diff --git a/ext/simpletest/simpletest/test_case.php b/lib/simpletest/test_case.php
similarity index 100%
rename from ext/simpletest/simpletest/test_case.php
rename to lib/simpletest/test_case.php
diff --git a/ext/simpletest/simpletest/tidy_parser.php b/lib/simpletest/tidy_parser.php
similarity index 100%
rename from ext/simpletest/simpletest/tidy_parser.php
rename to lib/simpletest/tidy_parser.php
diff --git a/ext/simpletest/simpletest/unit_tester.php b/lib/simpletest/unit_tester.php
similarity index 100%
rename from ext/simpletest/simpletest/unit_tester.php
rename to lib/simpletest/unit_tester.php
diff --git a/ext/simpletest/simpletest/url.php b/lib/simpletest/url.php
similarity index 100%
rename from ext/simpletest/simpletest/url.php
rename to lib/simpletest/url.php
diff --git a/ext/simpletest/simpletest/user_agent.php b/lib/simpletest/user_agent.php
similarity index 100%
rename from ext/simpletest/simpletest/user_agent.php
rename to lib/simpletest/user_agent.php
diff --git a/ext/simpletest/simpletest/web_tester.php b/lib/simpletest/web_tester.php
similarity index 100%
rename from ext/simpletest/simpletest/web_tester.php
rename to lib/simpletest/web_tester.php
diff --git a/ext/simpletest/simpletest/xml.php b/lib/simpletest/xml.php
similarity index 100%
rename from ext/simpletest/simpletest/xml.php
rename to lib/simpletest/xml.php