diff --git a/INSTALL b/INSTALL
index 25005ac..cb51247 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-Refer to the wiki: http://wiki.volkszaehler.org/getstarted
+Refer to the wiki: http://wiki.volkszaehler.org/howto/getstarted
diff --git a/backend/lib/Model/Entity.php b/backend/lib/Model/Entity.php
index c868160..46084c7 100644
--- a/backend/lib/Model/Entity.php
+++ b/backend/lib/Model/Entity.php
@@ -49,7 +49,7 @@ use Volkszaehler\Util;
 abstract class Entity {
 	/**
 	 * @Id
-	 * @Column(type="smallint", nullable=false)
+	 * @Column(type="integer", nullable=false)
 	 * @GeneratedValue(strategy="AUTO")
 	 */
 	protected $id;
diff --git a/backend/lib/Model/Property.php b/backend/lib/Model/Property.php
index f9681fb..9c0391b 100644
--- a/backend/lib/Model/Property.php
+++ b/backend/lib/Model/Property.php
@@ -46,7 +46,7 @@ use Volkszaehler\Model;
 class Property {
 	/**
 	 * @Id
-	 * @Column(type="smallint", nullable=false)
+	 * @Column(type="integer", nullable=false)
 	 * @GeneratedValue(strategy="AUTO")
 	 *
 	 * @todo wait until DDC-117 is fixed (PKs on FKs)
diff --git a/backend/lib/Model/Token.php b/backend/lib/Model/Token.php
index ae8b560..2d443a5 100644
--- a/backend/lib/Model/Token.php
+++ b/backend/lib/Model/Token.php
@@ -38,7 +38,7 @@ use Volkszaehler\Util;
 class Token {
 	/**
 	 * @Id
-	 * @Column(type="smallint", nullable=false)
+	 * @Column(type="integer", nullable=false)
 	 * @GeneratedValue(strategy="AUTO")
 	 *
 	 * @todo wait until DDC-117 is fixed (PKs on FKs)
diff --git a/frontend/javascripts/frontend.js b/frontend/javascripts/frontend.js
index 08edcaa..fbcf568 100644
--- a/frontend/javascripts/frontend.js
+++ b/frontend/javascripts/frontend.js
@@ -173,7 +173,6 @@ vz.wui.handleControls = function () {
 			vz.options.plot.xaxis.max = new Date().getTime();
 			vz.options.plot.xaxis.min = new Date().getTime() - delta;
 			break;
-			
 		case 'move-back':
 			vz.options.plot.xaxis.min -= delta;
 			vz.options.plot.xaxis.max -= delta;
@@ -182,46 +181,38 @@ vz.wui.handleControls = function () {
 			vz.options.plot.xaxis.min += delta;
 			vz.options.plot.xaxis.max += delta;
 			break;
-		
 		case 'zoom-reset':
 			vz.options.plot.xaxis.min = middle - vz.options.defaultInterval/2;
 			vz.options.plot.xaxis.max =  middle + vz.options.defaultInterval/2;
 			break;
-			
 		case 'zoom-in':
 			vz.options.plot.xaxis.min += delta/4;
 			vz.options.plot.xaxis.max -= delta/4;
 			break;
-			
 		case 'zoom-out':
 			vz.options.plot.xaxis.min -= delta;
 			vz.options.plot.xaxis.max += delta;
 			break;
-
 		case 'zoom-hour':
 			hour = 60*60*1000;
 			vz.options.plot.xaxis.min = middle - hour/2;
 			vz.options.plot.xaxis.max =  middle + hour/2;
 			break;
-
 		case 'zoom-day':
 			var day = 24*60*60*1000;
 			vz.options.plot.xaxis.min = middle - day/2;
 			vz.options.plot.xaxis.max =  middle + day/2;
 			break;
-
 		case 'zoom-week':
 			var week = 7*24*60*60*1000;
 			vz.options.plot.xaxis.min = middle - week/2;
 			vz.options.plot.xaxis.max =  middle + week/2;
 			break;
-
 		case 'zoom-month':
 			var month = 30*24*60*60*1000;
 			vz.options.plot.xaxis.min = middle - month/2;
 			vz.options.plot.xaxis.max =  middle + month/2;
 			break;
-
 		case 'zoom-year':
 			var year = 365*24*60*60*1000;
 			vz.options.plot.xaxis.min = middle - year/2;
diff --git a/share/sql/demo/entities.sql b/share/sql/demo/entities.sql
index 435f1d4..b39bdbe 100644
--- a/share/sql/demo/entities.sql
+++ b/share/sql/demo/entities.sql
@@ -20,7 +20,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 --
 
 CREATE TABLE IF NOT EXISTS `entities` (
-  `id` smallint(6) NOT NULL AUTO_INCREMENT,
+  `id` int(6) NOT NULL AUTO_INCREMENT,
   `uuid` varchar(36) NOT NULL,
   `type` varchar(255) NOT NULL,
   `class` varchar(255) NOT NULL,
@@ -33,14 +33,5 @@ CREATE TABLE IF NOT EXISTS `entities` (
 --
 
 INSERT INTO `entities` (`id`, `uuid`, `type`, `class`) VALUES
-(1, 'a301d8d0-903b-1234-94bb-d943d061b6a8', 'power', 'channel'),
-(2, '99c4b540-9025-1234-8457-1d974d0a2aed', 'power', 'channel'),
-(3, 'e1667740-9662-1234-b301-01e92d4b3942', 'group', 'aggregator'),
-(4, 'd81facc0-966e-1234-9ba7-cdb480edfd96', 'group', 'aggregator'),
-(5, '7aab2690-966f-1234-bc2b-0b307fe1be90', 'group', 'aggregator'),
-(6, 'bda4a740-9662-1234-94c8-010787c77162', 'group', 'aggregator'),
-(7, 'c48c2a90-9662-1234-acd6-972b5a34a506', 'group', 'aggregator'),
-(8, '998d2ec0-caeb-1234-96a6-25bf0849305f', 'power', 'channel'),
-(9, '9f3695b0-caeb-1234-b0cd-cdc70d5c6405', 'power', 'channel'),
-(10, 'a21effa0-caeb-1234-9b05-1f6afa5f3812', 'power', 'channel');
+(1, 'a301d8d0-903b-1234-94bb-d943d061b6a8', 'power', 'channel');
 
diff --git a/share/sql/demo/properties.sql b/share/sql/demo/properties.sql
index 42d3fa8..e97e94f 100644
--- a/share/sql/demo/properties.sql
+++ b/share/sql/demo/properties.sql
@@ -20,8 +20,8 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 --
 
 CREATE TABLE IF NOT EXISTS `properties` (
-  `id` smallint(6) NOT NULL AUTO_INCREMENT,
-  `entity_id` smallint(6) DEFAULT NULL,
+  `id` integer(6) NOT NULL AUTO_INCREMENT,
+  `entity_id` int(6) DEFAULT NULL,
   `pkey` varchar(255) NOT NULL,
   `value` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
@@ -36,13 +36,4 @@ CREATE TABLE IF NOT EXISTS `properties` (
 INSERT INTO `properties` (`id`, `entity_id`, `pkey`, `value`) VALUES
 (1, 1, 'title', 'S0-Zaehler'),
 (2, 1, 'description', 'Nummer 1'),
-(4, 1, 'resolution', '2000'),
-(5, 2, 'title', 'S0-Zaehler'),
-(6, 2, 'description', 'Nummer 2'),
-(8, 2, 'resolution', '2000'),
-(9, 8, 'title', 'test'),
-(10, 8, 'resolution', '2000'),
-(11, 9, 'title', 'test'),
-(12, 9, 'resolution', '2000'),
-(13, 10, 'title', 'test'),
-(14, 10, 'resolution', '2000');
+(4, 1, 'resolution', '2000');