diff --git a/database.sql b/database.sql
index 79e81f1d22..afd5ad4d1a 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.6-dev (Asparagus)
--- DB_UPDATE_VERSION 1241
+-- DB_UPDATE_VERSION 1242
 -- ------------------------------------------
 
 
@@ -8,13 +8,13 @@
 -- TABLE addon
 --
 CREATE TABLE IF NOT EXISTS `addon` (
-	`id` int(11) NOT NULL auto_increment,
-	`name` varchar(190) NOT NULL DEFAULT '',
-	`version` varchar(255) NOT NULL DEFAULT '',
-	`installed` tinyint(1) NOT NULL DEFAULT 0,
-	`hidden` tinyint(1) NOT NULL DEFAULT 0,
-	`timestamp` bigint(20) NOT NULL DEFAULT 0,
-	`plugin_admin` tinyint(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`name` varchar(190) NOT NULL DEFAULT '' COMMENT '',
+	`version` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`installed` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`timestamp` bigint NOT NULL DEFAULT 0 COMMENT '',
+	`plugin_admin` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `name` (`name`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -23,19 +23,19 @@ CREATE TABLE IF NOT EXISTS `addon` (
 -- TABLE attach
 --
 CREATE TABLE IF NOT EXISTS `attach` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`hash` varchar(64) NOT NULL DEFAULT '',
-	`filename` varchar(255) NOT NULL DEFAULT '',
-	`filetype` varchar(64) NOT NULL DEFAULT '',
-	`filesize` int(11) NOT NULL DEFAULT 0,
-	`data` longblob NOT NULL,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`allow_cid` mediumtext,
-	`allow_gid` mediumtext,
-	`deny_cid` mediumtext,
-	`deny_gid` mediumtext,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`hash` varchar(64) NOT NULL DEFAULT '' COMMENT '',
+	`filename` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`filetype` varchar(64) NOT NULL DEFAULT '' COMMENT '',
+	`filesize` int NOT NULL DEFAULT 0 COMMENT '',
+	`data` longblob NOT NULL COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`allow_cid` mediumtext COMMENT '',
+	`allow_gid` mediumtext COMMENT '',
+	`deny_cid` mediumtext COMMENT '',
+	`deny_gid` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -43,11 +43,11 @@ CREATE TABLE IF NOT EXISTS `attach` (
 -- TABLE auth_codes
 --
 CREATE TABLE IF NOT EXISTS `auth_codes` (
-	`id` varchar(40) NOT NULL,
-	`client_id` varchar(20) NOT NULL DEFAULT '',
-	`redirect_uri` varchar(200) NOT NULL DEFAULT '',
-	`expires` int(11) NOT NULL DEFAULT 0,
-	`scope` varchar(250) NOT NULL DEFAULT '',
+	`id` varchar(40) NOT NULL COMMENT '',
+	`client_id` varchar(20) NOT NULL DEFAULT '' COMMENT '',
+	`redirect_uri` varchar(200) NOT NULL DEFAULT '' COMMENT '',
+	`expires` int NOT NULL DEFAULT 0 COMMENT '',
+	`scope` varchar(250) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -55,10 +55,10 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 -- TABLE cache
 --
 CREATE TABLE IF NOT EXISTS `cache` (
-	`k` varbinary(255) NOT NULL,
-	`v` mediumtext,
-	`expire_mode` int(11) NOT NULL DEFAULT 0,
-	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`k` varbinary(255) NOT NULL COMMENT '',
+	`v` mediumtext COMMENT '',
+	`expire_mode` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`k`),
 	 INDEX `expire_mode_updated` (`expire_mode`,`updated`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -67,12 +67,12 @@ CREATE TABLE IF NOT EXISTS `cache` (
 -- TABLE challenge
 --
 CREATE TABLE IF NOT EXISTS `challenge` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`challenge` varchar(255) NOT NULL DEFAULT '',
-	`dfrn-id` varchar(255) NOT NULL DEFAULT '',
-	`expire` int(11) NOT NULL DEFAULT 0,
-	`type` varchar(255) NOT NULL DEFAULT '',
-	`last_update` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`challenge` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`expire` int NOT NULL DEFAULT 0 COMMENT '',
+	`type` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`last_update` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -80,12 +80,12 @@ CREATE TABLE IF NOT EXISTS `challenge` (
 -- TABLE clients
 --
 CREATE TABLE IF NOT EXISTS `clients` (
-	`client_id` varchar(20) NOT NULL,
-	`pw` varchar(20) NOT NULL DEFAULT '',
-	`redirect_uri` varchar(200) NOT NULL DEFAULT '',
-	`name` text,
-	`icon` text,
-	`uid` int(11) NOT NULL DEFAULT 0,
+	`client_id` varchar(20) NOT NULL COMMENT '',
+	`pw` varchar(20) NOT NULL DEFAULT '' COMMENT '',
+	`redirect_uri` varchar(200) NOT NULL DEFAULT '' COMMENT '',
+	`name` text COMMENT '',
+	`icon` text COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`client_id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -93,10 +93,10 @@ CREATE TABLE IF NOT EXISTS `clients` (
 -- TABLE config
 --
 CREATE TABLE IF NOT EXISTS `config` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`cat` varbinary(255) NOT NULL DEFAULT '',
-	`k` varbinary(255) NOT NULL DEFAULT '',
-	`v` mediumtext,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`cat` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`k` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`v` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `cat_k` (`cat`,`k`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -105,74 +105,74 @@ CREATE TABLE IF NOT EXISTS `config` (
 -- TABLE contact
 --
 CREATE TABLE IF NOT EXISTS `contact` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`self` tinyint(1) NOT NULL DEFAULT 0,
-	`remote_self` tinyint(1) NOT NULL DEFAULT 0,
-	`rel` tinyint(1) NOT NULL DEFAULT 0,
-	`duplex` tinyint(1) NOT NULL DEFAULT 0,
-	`network` varchar(255) NOT NULL DEFAULT '',
-	`name` varchar(255) NOT NULL DEFAULT '',
-	`nick` varchar(255) NOT NULL DEFAULT '',
-	`location` varchar(255) NOT NULL DEFAULT '',
-	`about` text,
-	`keywords` text,
-	`gender` varchar(32) NOT NULL DEFAULT '',
-	`xmpp` varchar(255) NOT NULL DEFAULT '',
-	`attag` varchar(255) NOT NULL DEFAULT '',
-	`avatar` varchar(255) NOT NULL DEFAULT '',
-	`photo` text,
-	`thumb` text,
-	`micro` text,
-	`site-pubkey` text,
-	`issued-id` varchar(255) NOT NULL DEFAULT '',
-	`dfrn-id` varchar(255) NOT NULL DEFAULT '',
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`nurl` varchar(255) NOT NULL DEFAULT '',
-	`addr` varchar(255) NOT NULL DEFAULT '',
-	`alias` varchar(255) NOT NULL DEFAULT '',
-	`pubkey` text,
-	`prvkey` text,
-	`batch` varchar(255) NOT NULL DEFAULT '',
-	`request` text,
-	`notify` text,
-	`poll` text,
-	`confirm` text,
-	`poco` text,
-	`aes_allow` tinyint(1) NOT NULL DEFAULT 0,
-	`ret-aes` tinyint(1) NOT NULL DEFAULT 0,
-	`usehub` tinyint(1) NOT NULL DEFAULT 0,
-	`subhub` tinyint(1) NOT NULL DEFAULT 0,
-	`hub-verify` varchar(255) NOT NULL DEFAULT '',
-	`last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`term-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`priority` tinyint(3) NOT NULL DEFAULT 0,
-	`blocked` tinyint(1) NOT NULL DEFAULT 1,
-	`readonly` tinyint(1) NOT NULL DEFAULT 0,
-	`writable` tinyint(1) NOT NULL DEFAULT 0,
-	`forum` tinyint(1) NOT NULL DEFAULT 0,
-	`prv` tinyint(1) NOT NULL DEFAULT 0,
-	`contact-type` int(11) NOT NULL DEFAULT 0,
-	`hidden` tinyint(1) NOT NULL DEFAULT 0,
-	`archive` tinyint(1) NOT NULL DEFAULT 0,
-	`pending` tinyint(1) NOT NULL DEFAULT 1,
-	`rating` tinyint(1) NOT NULL DEFAULT 0,
-	`reason` text,
-	`closeness` tinyint(2) NOT NULL DEFAULT 99,
-	`info` mediumtext,
-	`profile-id` int(11) NOT NULL DEFAULT 0,
-	`bdyear` varchar(4) NOT NULL DEFAULT '',
-	`bd` date NOT NULL DEFAULT '0001-01-01',
-	`notify_new_posts` tinyint(1) NOT NULL DEFAULT 0,
-	`fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
-	`ffi_keyword_blacklist` text,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`self` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`remote_self` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`rel` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`duplex` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`network` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`about` text COMMENT '',
+	`keywords` text COMMENT '',
+	`gender` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`attag` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` text COMMENT '',
+	`thumb` text COMMENT '',
+	`micro` text COMMENT '',
+	`site-pubkey` text COMMENT '',
+	`issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`addr` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`alias` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pubkey` text COMMENT '',
+	`prvkey` text COMMENT '',
+	`batch` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`request` text COMMENT '',
+	`notify` text COMMENT '',
+	`poll` text COMMENT '',
+	`confirm` text COMMENT '',
+	`poco` text COMMENT '',
+	`aes_allow` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`ret-aes` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`usehub` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`subhub` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`hub-verify` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`term-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`priority` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`blocked` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`readonly` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`writable` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`forum` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`prv` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`contact-type` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`archive` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`pending` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`rating` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`reason` text COMMENT '',
+	`closeness` tinyint NOT NULL DEFAULT 99 COMMENT '',
+	`info` mediumtext COMMENT '',
+	`profile-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`bdyear` varchar(4) NOT NULL DEFAULT '' COMMENT '',
+	`bd` date NOT NULL DEFAULT '0001-01-01' COMMENT '',
+	`notify_new_posts` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`fetch_further_information` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`ffi_keyword_blacklist` text COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_name` (`uid`,`name`(190)),
 	 INDEX `self_uid` (`self`,`uid`),
@@ -192,14 +192,14 @@ CREATE TABLE IF NOT EXISTS `contact` (
 -- TABLE conv
 --
 CREATE TABLE IF NOT EXISTS `conv` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`guid` varchar(255) NOT NULL DEFAULT '',
-	`recips` text,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`creator` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`subject` text,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`recips` text COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`creator` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`subject` text COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -208,13 +208,13 @@ CREATE TABLE IF NOT EXISTS `conv` (
 -- TABLE conversation
 --
 CREATE TABLE IF NOT EXISTS `conversation` (
-	`item-uri` varbinary(255) NOT NULL,
-	`reply-to-uri` varbinary(255) NOT NULL DEFAULT '',
-	`conversation-uri` varbinary(255) NOT NULL DEFAULT '',
-	`conversation-href` varbinary(255) NOT NULL DEFAULT '',
-	`protocol` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`source` mediumtext,
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`item-uri` varbinary(255) NOT NULL COMMENT '',
+	`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`protocol` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`source` mediumtext COMMENT '',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`item-uri`),
 	 INDEX `conversation-uri` (`conversation-uri`),
 	 INDEX `received` (`received`)
@@ -224,26 +224,26 @@ CREATE TABLE IF NOT EXISTS `conversation` (
 -- TABLE event
 --
 CREATE TABLE IF NOT EXISTS `event` (
-	`id` int(11) NOT NULL auto_increment,
-	`guid` varchar(255) NOT NULL DEFAULT '',
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`cid` int(11) NOT NULL DEFAULT 0,
-	`uri` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`start` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`finish` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`summary` text,
-	`desc` text,
-	`location` text,
-	`type` varchar(255) NOT NULL DEFAULT '',
-	`nofinish` tinyint(1) NOT NULL DEFAULT 0,
-	`adjust` tinyint(1) NOT NULL DEFAULT 1,
-	`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`allow_cid` mediumtext,
-	`allow_gid` mediumtext,
-	`deny_cid` mediumtext,
-	`deny_gid` mediumtext,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`cid` int NOT NULL DEFAULT 0 COMMENT '',
+	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`start` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`finish` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`summary` text COMMENT '',
+	`desc` text COMMENT '',
+	`location` text COMMENT '',
+	`type` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nofinish` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`adjust` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`allow_cid` mediumtext COMMENT '',
+	`allow_gid` mediumtext COMMENT '',
+	`deny_cid` mediumtext COMMENT '',
+	`deny_gid` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_start` (`uid`,`start`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -252,23 +252,23 @@ CREATE TABLE IF NOT EXISTS `event` (
 -- TABLE fcontact
 --
 CREATE TABLE IF NOT EXISTS `fcontact` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`guid` varchar(255) NOT NULL DEFAULT '',
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`name` varchar(255) NOT NULL DEFAULT '',
-	`photo` varchar(255) NOT NULL DEFAULT '',
-	`request` varchar(255) NOT NULL DEFAULT '',
-	`nick` varchar(255) NOT NULL DEFAULT '',
-	`addr` varchar(255) NOT NULL DEFAULT '',
-	`batch` varchar(255) NOT NULL DEFAULT '',
-	`notify` varchar(255) NOT NULL DEFAULT '',
-	`poll` varchar(255) NOT NULL DEFAULT '',
-	`confirm` varchar(255) NOT NULL DEFAULT '',
-	`priority` tinyint(1) NOT NULL DEFAULT 0,
-	`network` varchar(32) NOT NULL DEFAULT '',
-	`alias` varchar(255) NOT NULL DEFAULT '',
-	`pubkey` text,
-	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`request` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`addr` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`batch` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`notify` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`poll` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`confirm` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`priority` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`alias` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pubkey` text COMMENT '',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `addr` (`addr`(32)),
 	 UNIQUE INDEX `url` (`url`(190))
@@ -278,15 +278,15 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 -- TABLE fsuggest
 --
 CREATE TABLE IF NOT EXISTS `fsuggest` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`cid` int(11) NOT NULL DEFAULT 0,
-	`name` varchar(255) NOT NULL DEFAULT '',
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`request` varchar(255) NOT NULL DEFAULT '',
-	`photo` varchar(255) NOT NULL DEFAULT '',
-	`note` text,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`cid` int NOT NULL DEFAULT 0 COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`request` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`note` text COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -294,9 +294,9 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
 -- TABLE gcign
 --
 CREATE TABLE IF NOT EXISTS `gcign` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`gcid` int(11) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`gcid` int NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
 	 INDEX `gcid` (`gcid`)
@@ -306,32 +306,32 @@ CREATE TABLE IF NOT EXISTS `gcign` (
 -- TABLE gcontact
 --
 CREATE TABLE IF NOT EXISTS `gcontact` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`name` varchar(255) NOT NULL DEFAULT '',
-	`nick` varchar(255) NOT NULL DEFAULT '',
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`nurl` varchar(255) NOT NULL DEFAULT '',
-	`photo` varchar(255) NOT NULL DEFAULT '',
-	`connect` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`updated` datetime DEFAULT '0001-01-01 00:00:00',
-	`last_contact` datetime DEFAULT '0001-01-01 00:00:00',
-	`last_failure` datetime DEFAULT '0001-01-01 00:00:00',
-	`location` varchar(255) NOT NULL DEFAULT '',
-	`about` text,
-	`keywords` text,
-	`gender` varchar(32) NOT NULL DEFAULT '',
-	`birthday` varchar(32) NOT NULL DEFAULT '0001-01-01',
-	`community` tinyint(1) NOT NULL DEFAULT 0,
-	`contact-type` tinyint(1) NOT NULL DEFAULT -1,
-	`hide` tinyint(1) NOT NULL DEFAULT 0,
-	`nsfw` tinyint(1) NOT NULL DEFAULT 0,
-	`network` varchar(255) NOT NULL DEFAULT '',
-	`addr` varchar(255) NOT NULL DEFAULT '',
-	`notify` text,
-	`alias` varchar(255) NOT NULL DEFAULT '',
-	`generation` tinyint(3) NOT NULL DEFAULT 0,
-	`server_url` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`connect` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`updated` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`about` text COMMENT '',
+	`keywords` text COMMENT '',
+	`gender` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`birthday` varchar(32) NOT NULL DEFAULT '0001-01-01' COMMENT '',
+	`community` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`contact-type` tinyint NOT NULL DEFAULT -1 COMMENT '',
+	`hide` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`nsfw` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`network` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`addr` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`notify` text COMMENT '',
+	`alias` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`generation` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`server_url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `nurl` (`nurl`(190)),
 	 INDEX `name` (`name`(64)),
@@ -345,12 +345,12 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 -- TABLE glink
 --
 CREATE TABLE IF NOT EXISTS `glink` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`cid` int(11) NOT NULL DEFAULT 0,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`gcid` int(11) NOT NULL DEFAULT 0,
-	`zcid` int(11) NOT NULL DEFAULT 0,
-	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`cid` int NOT NULL DEFAULT 0 COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`gcid` int NOT NULL DEFAULT 0 COMMENT '',
+	`zcid` int NOT NULL DEFAULT 0 COMMENT '',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
 	 INDEX `gcid` (`gcid`)
@@ -360,11 +360,11 @@ CREATE TABLE IF NOT EXISTS `glink` (
 -- TABLE group
 --
 CREATE TABLE IF NOT EXISTS `group` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`visible` tinyint(1) NOT NULL DEFAULT 0,
-	`deleted` tinyint(1) NOT NULL DEFAULT 0,
-	`name` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -373,9 +373,9 @@ CREATE TABLE IF NOT EXISTS `group` (
 -- TABLE group_member
 --
 CREATE TABLE IF NOT EXISTS `group_member` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`gid` int(10) unsigned NOT NULL DEFAULT 0,
-	`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`gid` int NOT NULL DEFAULT 0 COMMENT '',
+	`contact-id` int NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `contactid` (`contact-id`),
 	 UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`)
@@ -385,22 +385,22 @@ CREATE TABLE IF NOT EXISTS `group_member` (
 -- TABLE gserver
 --
 CREATE TABLE IF NOT EXISTS `gserver` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`nurl` varchar(255) NOT NULL DEFAULT '',
-	`version` varchar(255) NOT NULL DEFAULT '',
-	`site_name` varchar(255) NOT NULL DEFAULT '',
-	`info` text,
-	`register_policy` tinyint(1) NOT NULL DEFAULT 0,
-	`registered-users` int(10) NOT NULL DEFAULT 0,
-	`poco` varchar(255) NOT NULL DEFAULT '',
-	`noscrape` varchar(255) NOT NULL DEFAULT '',
-	`network` varchar(32) NOT NULL DEFAULT '',
-	`platform` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`last_poco_query` datetime DEFAULT '0001-01-01 00:00:00',
-	`last_contact` datetime DEFAULT '0001-01-01 00:00:00',
-	`last_failure` datetime DEFAULT '0001-01-01 00:00:00',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`version` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`site_name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`info` text COMMENT '',
+	`register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`registered-users` int NOT NULL DEFAULT 0 COMMENT '',
+	`poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`platform` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last_poco_query` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last_contact` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `nurl` (`nurl`(190))
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -409,11 +409,11 @@ CREATE TABLE IF NOT EXISTS `gserver` (
 -- TABLE hook
 --
 CREATE TABLE IF NOT EXISTS `hook` (
-	`id` int(11) NOT NULL auto_increment,
-	`hook` varchar(255) NOT NULL DEFAULT '',
-	`file` varchar(255) NOT NULL DEFAULT '',
-	`function` varchar(255) NOT NULL DEFAULT '',
-	`priority` int(11) unsigned NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`hook` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`file` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`function` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`priority` smallint NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `hook_file_function` (`hook`(50),`file`(80),`function`(60))
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -422,17 +422,17 @@ CREATE TABLE IF NOT EXISTS `hook` (
 -- TABLE intro
 --
 CREATE TABLE IF NOT EXISTS `intro` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`fid` int(11) NOT NULL DEFAULT 0,
-	`contact-id` int(11) NOT NULL DEFAULT 0,
-	`knowyou` tinyint(1) NOT NULL DEFAULT 0,
-	`duplex` tinyint(1) NOT NULL DEFAULT 0,
-	`note` text,
-	`hash` varchar(255) NOT NULL DEFAULT '',
-	`datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`blocked` tinyint(1) NOT NULL DEFAULT 1,
-	`ignore` tinyint(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`fid` int NOT NULL DEFAULT 0 COMMENT '',
+	`contact-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`knowyou` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`duplex` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`note` text COMMENT '',
+	`hash` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`blocked` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -440,71 +440,71 @@ CREATE TABLE IF NOT EXISTS `intro` (
 -- TABLE item
 --
 CREATE TABLE IF NOT EXISTS `item` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`guid` varchar(255) NOT NULL DEFAULT '',
-	`uri` varchar(255) NOT NULL DEFAULT '',
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`contact-id` int(11) NOT NULL DEFAULT 0,
-	`gcontact-id` int(11) unsigned NOT NULL DEFAULT 0,
-	`type` varchar(255) NOT NULL DEFAULT '',
-	`wall` tinyint(1) NOT NULL DEFAULT 0,
-	`gravity` tinyint(1) NOT NULL DEFAULT 0,
-	`parent` int(10) unsigned NOT NULL DEFAULT 0,
-	`parent-uri` varchar(255) NOT NULL DEFAULT '',
-	`extid` varchar(255) NOT NULL DEFAULT '',
-	`thr-parent` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`owner-id` int(11) NOT NULL DEFAULT 0,
-	`owner-name` varchar(255) NOT NULL DEFAULT '',
-	`owner-link` varchar(255) NOT NULL DEFAULT '',
-	`owner-avatar` varchar(255) NOT NULL DEFAULT '',
-	`author-id` int(11) NOT NULL DEFAULT 0,
-	`author-name` varchar(255) NOT NULL DEFAULT '',
-	`author-link` varchar(255) NOT NULL DEFAULT '',
-	`author-avatar` varchar(255) NOT NULL DEFAULT '',
-	`title` varchar(255) NOT NULL DEFAULT '',
-	`body` mediumtext,
-	`app` varchar(255) NOT NULL DEFAULT '',
-	`verb` varchar(255) NOT NULL DEFAULT '',
-	`object-type` varchar(255) NOT NULL DEFAULT '',
-	`object` text,
-	`target-type` varchar(255) NOT NULL DEFAULT '',
-	`target` text,
-	`postopts` text,
-	`plink` varchar(255) NOT NULL DEFAULT '',
-	`resource-id` varchar(255) NOT NULL DEFAULT '',
-	`event-id` int(11) NOT NULL DEFAULT 0,
-	`tag` mediumtext,
-	`attach` mediumtext,
-	`inform` mediumtext,
-	`file` mediumtext,
-	`location` varchar(255) NOT NULL DEFAULT '',
-	`coord` varchar(255) NOT NULL DEFAULT '',
-	`allow_cid` mediumtext,
-	`allow_gid` mediumtext,
-	`deny_cid` mediumtext,
-	`deny_gid` mediumtext,
-	`private` tinyint(1) NOT NULL DEFAULT 0,
-	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
-	`moderated` tinyint(1) NOT NULL DEFAULT 0,
-	`visible` tinyint(1) NOT NULL DEFAULT 0,
-	`spam` tinyint(1) NOT NULL DEFAULT 0,
-	`starred` tinyint(1) NOT NULL DEFAULT 0,
-	`bookmark` tinyint(1) NOT NULL DEFAULT 0,
-	`unseen` tinyint(1) NOT NULL DEFAULT 1,
-	`deleted` tinyint(1) NOT NULL DEFAULT 0,
-	`origin` tinyint(1) NOT NULL DEFAULT 0,
-	`forum_mode` tinyint(1) NOT NULL DEFAULT 0,
-	`last-child` tinyint(1) unsigned NOT NULL DEFAULT 1,
-	`mention` tinyint(1) NOT NULL DEFAULT 0,
-	`network` varchar(32) NOT NULL DEFAULT '',
-	`rendered-hash` varchar(32) NOT NULL DEFAULT '',
-	`rendered-html` mediumtext,
-	`global` tinyint(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment,
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`contact-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`gcontact-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`type` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`wall` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`gravity` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`parent` int NOT NULL DEFAULT 0 COMMENT '',
+	`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`thr-parent` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`owner-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`owner-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`owner-link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`owner-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`author-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`author-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`author-link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`author-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`body` mediumtext COMMENT '',
+	`app` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`verb` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`object-type` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`object` text COMMENT '',
+	`target-type` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`target` text COMMENT '',
+	`postopts` text COMMENT '',
+	`plink` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`resource-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`event-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`tag` mediumtext COMMENT '',
+	`attach` mediumtext COMMENT '',
+	`inform` mediumtext COMMENT '',
+	`file` mediumtext COMMENT '',
+	`location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`allow_cid` mediumtext COMMENT '',
+	`allow_gid` mediumtext COMMENT '',
+	`deny_cid` mediumtext COMMENT '',
+	`deny_gid` mediumtext COMMENT '',
+	`private` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`spam` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`starred` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`bookmark` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`unseen` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`origin` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`forum_mode` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`last-child` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`rendered-html` mediumtext COMMENT '',
+	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `guid` (`guid`(191)),
 	 INDEX `uri` (`uri`(191)),
@@ -538,10 +538,10 @@ CREATE TABLE IF NOT EXISTS `item` (
 -- TABLE locks
 --
 CREATE TABLE IF NOT EXISTS `locks` (
-	`id` int(11) NOT NULL auto_increment,
-	`name` varchar(128) NOT NULL DEFAULT '',
-	`locked` tinyint(1) NOT NULL DEFAULT 0,
-	`pid` int(10) unsigned NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`name` varchar(128) NOT NULL DEFAULT '' COMMENT '',
+	`locked` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`pid` int NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -549,23 +549,23 @@ CREATE TABLE IF NOT EXISTS `locks` (
 -- TABLE mail
 --
 CREATE TABLE IF NOT EXISTS `mail` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`guid` varchar(255) NOT NULL DEFAULT '',
-	`from-name` varchar(255) NOT NULL DEFAULT '',
-	`from-photo` varchar(255) NOT NULL DEFAULT '',
-	`from-url` varchar(255) NOT NULL DEFAULT '',
-	`contact-id` varchar(255) NOT NULL DEFAULT '',
-	`convid` int(11) unsigned NOT NULL DEFAULT 0,
-	`title` varchar(255) NOT NULL DEFAULT '',
-	`body` mediumtext,
-	`seen` tinyint(1) NOT NULL DEFAULT 0,
-	`reply` tinyint(1) NOT NULL DEFAULT 0,
-	`replied` tinyint(1) NOT NULL DEFAULT 0,
-	`unknown` tinyint(1) NOT NULL DEFAULT 0,
-	`uri` varchar(255) NOT NULL DEFAULT '',
-	`parent-uri` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`from-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`from-photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`from-url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`contact-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`convid` int NOT NULL DEFAULT 0 COMMENT '',
+	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`body` mediumtext COMMENT '',
+	`seen` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`reply` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`replied` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`unknown` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_seen` (`uid`,`seen`),
 	 INDEX `convid` (`convid`),
@@ -578,19 +578,19 @@ CREATE TABLE IF NOT EXISTS `mail` (
 -- TABLE mailacct
 --
 CREATE TABLE IF NOT EXISTS `mailacct` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`server` varchar(255) NOT NULL DEFAULT '',
-	`port` int(11) NOT NULL DEFAULT 0,
-	`ssltype` varchar(16) NOT NULL DEFAULT '',
-	`mailbox` varchar(255) NOT NULL DEFAULT '',
-	`user` varchar(255) NOT NULL DEFAULT '',
-	`pass` text,
-	`reply_to` varchar(255) NOT NULL DEFAULT '',
-	`action` int(11) NOT NULL DEFAULT 0,
-	`movetofolder` varchar(255) NOT NULL DEFAULT '',
-	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
-	`last_check` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`server` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`port` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`ssltype` varchar(16) NOT NULL DEFAULT '' COMMENT '',
+	`mailbox` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`user` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pass` text COMMENT '',
+	`reply_to` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`action` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`movetofolder` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`last_check` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -598,9 +598,9 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 -- TABLE manage
 --
 CREATE TABLE IF NOT EXISTS `manage` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`mid` int(11) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`mid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uid_mid` (`uid`,`mid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -609,23 +609,23 @@ CREATE TABLE IF NOT EXISTS `manage` (
 -- TABLE notify
 --
 CREATE TABLE IF NOT EXISTS `notify` (
-	`id` int(11) NOT NULL auto_increment,
-	`hash` varchar(64) NOT NULL DEFAULT '',
-	`type` int(11) NOT NULL DEFAULT 0,
-	`name` varchar(255) NOT NULL DEFAULT '',
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`photo` varchar(255) NOT NULL DEFAULT '',
-	`date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`msg` mediumtext,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`link` varchar(255) NOT NULL DEFAULT '',
-	`iid` int(11) NOT NULL DEFAULT 0,
-	`parent` int(11) NOT NULL DEFAULT 0,
-	`seen` tinyint(1) NOT NULL DEFAULT 0,
-	`verb` varchar(255) NOT NULL DEFAULT '',
-	`otype` varchar(16) NOT NULL DEFAULT '',
-	`name_cache` tinytext,
-	`msg_cache` mediumtext,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`hash` varchar(64) NOT NULL DEFAULT '' COMMENT '',
+	`type` smallint NOT NULL DEFAULT 0 COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`msg` mediumtext COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`iid` int NOT NULL DEFAULT 0 COMMENT '',
+	`parent` int NOT NULL DEFAULT 0 COMMENT '',
+	`seen` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`verb` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`otype` varchar(16) NOT NULL DEFAULT '' COMMENT '',
+	`name_cache` tinytext COMMENT '',
+	`msg_cache` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `hash_uid` (`hash`,`uid`),
 	 INDEX `seen_uid_date` (`seen`,`uid`,`date`),
@@ -637,11 +637,11 @@ CREATE TABLE IF NOT EXISTS `notify` (
 -- TABLE notify-threads
 --
 CREATE TABLE IF NOT EXISTS `notify-threads` (
-	`id` int(11) NOT NULL auto_increment,
-	`notify-id` int(11) NOT NULL DEFAULT 0,
-	`master-parent-item` int(10) unsigned NOT NULL DEFAULT 0,
-	`parent-item` int(10) unsigned NOT NULL DEFAULT 0,
-	`receiver-uid` int(11) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`notify-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`master-parent-item` int NOT NULL DEFAULT 0 COMMENT '',
+	`parent-item` int NOT NULL DEFAULT 0 COMMENT '',
+	`receiver-uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -649,10 +649,10 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
 -- TABLE oembed
 --
 CREATE TABLE IF NOT EXISTS `oembed` (
-	`url` varbinary(255) NOT NULL,
-	`maxwidth` int(11) NOT NULL,
-	`content` mediumtext,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`url` varbinary(255) NOT NULL COMMENT '',
+	`maxwidth` mediumint NOT NULL COMMENT '',
+	`content` mediumtext COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`url`,`maxwidth`),
 	 INDEX `created` (`created`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -661,11 +661,11 @@ CREATE TABLE IF NOT EXISTS `oembed` (
 -- TABLE parsed_url
 --
 CREATE TABLE IF NOT EXISTS `parsed_url` (
-	`url` varbinary(255) NOT NULL,
-	`guessing` tinyint(1) NOT NULL DEFAULT 0,
-	`oembed` tinyint(1) NOT NULL DEFAULT 0,
-	`content` mediumtext,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`url` varbinary(255) NOT NULL COMMENT '',
+	`guessing` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`oembed` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`content` mediumtext COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`url`,`guessing`,`oembed`),
 	 INDEX `created` (`created`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -674,9 +674,10 @@ CREATE TABLE IF NOT EXISTS `parsed_url` (
 -- TABLE participation
 --
 CREATE TABLE IF NOT EXISTS `participation` (
-	`iid` int(10) unsigned NOT NULL,
-	`server` varchar(60) NOT NULL,
-	`cid` int(10) unsigned NOT NULL,
+	`iid` int NOT NULL COMMENT '',
+	`server` varchar(60) NOT NULL COMMENT '',
+	`cid` int NOT NULL COMMENT '',
+	`fid` int NOT NULL COMMENT '',
 	 PRIMARY KEY(`iid`,`server`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -684,11 +685,11 @@ CREATE TABLE IF NOT EXISTS `participation` (
 -- TABLE pconfig
 --
 CREATE TABLE IF NOT EXISTS `pconfig` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`cat` varbinary(255) NOT NULL DEFAULT '',
-	`k` varbinary(255) NOT NULL DEFAULT '',
-	`v` mediumtext,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`cat` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`k` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`v` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uid_cat_k` (`uid`,`cat`,`k`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -697,28 +698,28 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
 -- TABLE photo
 --
 CREATE TABLE IF NOT EXISTS `photo` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
-	`guid` varchar(64) NOT NULL DEFAULT '',
-	`resource-id` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`title` varchar(255) NOT NULL DEFAULT '',
-	`desc` text,
-	`album` varchar(255) NOT NULL DEFAULT '',
-	`filename` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`contact-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`guid` varchar(64) NOT NULL DEFAULT '' COMMENT '',
+	`resource-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`desc` text COMMENT '',
+	`album` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`filename` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`type` varchar(128) NOT NULL DEFAULT 'image/jpeg',
-	`height` smallint(6) NOT NULL DEFAULT 0,
-	`width` smallint(6) NOT NULL DEFAULT 0,
-	`datasize` int(10) unsigned NOT NULL DEFAULT 0,
-	`data` mediumblob NOT NULL,
-	`scale` tinyint(3) NOT NULL DEFAULT 0,
-	`profile` tinyint(1) NOT NULL DEFAULT 0,
-	`allow_cid` mediumtext,
-	`allow_gid` mediumtext,
-	`deny_cid` mediumtext,
-	`deny_gid` mediumtext,
+	`height` smallint NOT NULL DEFAULT 0 COMMENT '',
+	`width` smallint NOT NULL DEFAULT 0 COMMENT '',
+	`datasize` int NOT NULL DEFAULT 0 COMMENT '',
+	`data` mediumblob NOT NULL COMMENT '',
+	`scale` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`profile` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`allow_cid` mediumtext COMMENT '',
+	`allow_gid` mediumtext COMMENT '',
+	`deny_cid` mediumtext COMMENT '',
+	`deny_gid` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `contactid` (`contact-id`),
 	 INDEX `uid_contactid` (`uid`,`contact-id`),
@@ -732,18 +733,18 @@ CREATE TABLE IF NOT EXISTS `photo` (
 -- TABLE poll
 --
 CREATE TABLE IF NOT EXISTS `poll` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`q0` text,
-	`q1` text,
-	`q2` text,
-	`q3` text,
-	`q4` text,
-	`q5` text,
-	`q6` text,
-	`q7` text,
-	`q8` text,
-	`q9` text,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`q0` text COMMENT '',
+	`q1` text COMMENT '',
+	`q2` text COMMENT '',
+	`q3` text COMMENT '',
+	`q4` text COMMENT '',
+	`q5` text COMMENT '',
+	`q6` text COMMENT '',
+	`q7` text COMMENT '',
+	`q8` text COMMENT '',
+	`q9` text COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -752,21 +753,20 @@ CREATE TABLE IF NOT EXISTS `poll` (
 -- TABLE poll_result
 --
 CREATE TABLE IF NOT EXISTS `poll_result` (
-	`id` int(11) NOT NULL auto_increment,
-	`poll_id` int(11) NOT NULL DEFAULT 0,
-	`choice` int(11) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`poll_id` int NOT NULL DEFAULT 0,
+	`choice` tinyint NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
-	 INDEX `poll_id` (`poll_id`),
-	 INDEX `choice` (`choice`)
+	 INDEX `poll_id` (`poll_id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --
 -- TABLE process
 --
 CREATE TABLE IF NOT EXISTS `process` (
-	`pid` int(10) unsigned NOT NULL,
-	`command` varbinary(32) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+	`pid` int NOT NULL COMMENT '',
+	`command` varbinary(32) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`pid`),
 	 INDEX `command` (`command`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -775,48 +775,48 @@ CREATE TABLE IF NOT EXISTS `process` (
 -- TABLE profile
 --
 CREATE TABLE IF NOT EXISTS `profile` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`profile-name` varchar(255) NOT NULL DEFAULT '',
-	`is-default` tinyint(1) NOT NULL DEFAULT 0,
-	`hide-friends` tinyint(1) NOT NULL DEFAULT 0,
-	`name` varchar(255) NOT NULL DEFAULT '',
-	`pdesc` varchar(255) NOT NULL DEFAULT '',
-	`dob` varchar(32) NOT NULL DEFAULT '0001-01-01',
-	`address` varchar(255) NOT NULL DEFAULT '',
-	`locality` varchar(255) NOT NULL DEFAULT '',
-	`region` varchar(255) NOT NULL DEFAULT '',
-	`postal-code` varchar(32) NOT NULL DEFAULT '',
-	`country-name` varchar(255) NOT NULL DEFAULT '',
-	`hometown` varchar(255) NOT NULL DEFAULT '',
-	`gender` varchar(32) NOT NULL DEFAULT '',
-	`marital` varchar(255) NOT NULL DEFAULT '',
-	`with` text,
-	`howlong` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`sexual` varchar(255) NOT NULL DEFAULT '',
-	`politic` varchar(255) NOT NULL DEFAULT '',
-	`religion` varchar(255) NOT NULL DEFAULT '',
-	`pub_keywords` text,
-	`prv_keywords` text,
-	`likes` text,
-	`dislikes` text,
-	`about` text,
-	`summary` varchar(255) NOT NULL DEFAULT '',
-	`music` text,
-	`book` text,
-	`tv` text,
-	`film` text,
-	`interest` text,
-	`romance` text,
-	`work` text,
-	`education` text,
-	`contact` text,
-	`homepage` varchar(255) NOT NULL DEFAULT '',
-	`xmpp` varchar(255) NOT NULL DEFAULT '',
-	`photo` varchar(255) NOT NULL DEFAULT '',
-	`thumb` varchar(255) NOT NULL DEFAULT '',
-	`publish` tinyint(1) NOT NULL DEFAULT 0,
-	`net-publish` tinyint(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`profile-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`is-default` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`hide-friends` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pdesc` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`dob` varchar(32) NOT NULL DEFAULT '0001-01-01' COMMENT '',
+	`address` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`locality` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`region` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`postal-code` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`country-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`hometown` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`gender` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`marital` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`with` text COMMENT '',
+	`howlong` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`sexual` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`politic` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`religion` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pub_keywords` text COMMENT '',
+	`prv_keywords` text COMMENT '',
+	`likes` text COMMENT '',
+	`dislikes` text COMMENT '',
+	`about` text COMMENT '',
+	`summary` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`music` text COMMENT '',
+	`book` text COMMENT '',
+	`tv` text COMMENT '',
+	`film` text COMMENT '',
+	`interest` text COMMENT '',
+	`romance` text COMMENT '',
+	`work` text COMMENT '',
+	`education` text COMMENT '',
+	`contact` text COMMENT '',
+	`homepage` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`thumb` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`publish` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`net-publish` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_is-default` (`uid`,`is-default`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -825,12 +825,12 @@ CREATE TABLE IF NOT EXISTS `profile` (
 -- TABLE profile_check
 --
 CREATE TABLE IF NOT EXISTS `profile_check` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`cid` int(10) unsigned NOT NULL DEFAULT 0,
-	`dfrn_id` varchar(255) NOT NULL DEFAULT '',
-	`sec` varchar(255) NOT NULL DEFAULT '',
-	`expire` int(11) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`cid` int NOT NULL DEFAULT 0 COMMENT '',
+	`dfrn_id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`sec` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`expire` int NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -838,14 +838,14 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
 -- TABLE push_subscriber
 --
 CREATE TABLE IF NOT EXISTS `push_subscriber` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`callback_url` varchar(255) NOT NULL DEFAULT '',
-	`topic` varchar(255) NOT NULL DEFAULT '',
-	`nickname` varchar(255) NOT NULL DEFAULT '',
-	`push` int(11) NOT NULL DEFAULT 0,
-	`last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`secret` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`callback_url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`topic` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`push` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`secret` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -853,13 +853,13 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
 -- TABLE queue
 --
 CREATE TABLE IF NOT EXISTS `queue` (
-	`id` int(11) NOT NULL auto_increment,
-	`cid` int(11) NOT NULL DEFAULT 0,
-	`network` varchar(32) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`content` mediumtext,
-	`batch` tinyint(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`cid` int NOT NULL DEFAULT 0 COMMENT '',
+	`network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`content` mediumtext COMMENT '',
+	`batch` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `cid` (`cid`),
 	 INDEX `created` (`created`),
@@ -872,13 +872,13 @@ CREATE TABLE IF NOT EXISTS `queue` (
 -- TABLE register
 --
 CREATE TABLE IF NOT EXISTS `register` (
-	`id` int(11) unsigned NOT NULL auto_increment,
-	`hash` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`uid` int(11) unsigned NOT NULL DEFAULT 0,
-	`password` varchar(255) NOT NULL DEFAULT '',
-	`language` varchar(16) NOT NULL DEFAULT '',
-	`note` text,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`hash` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`password` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`language` varchar(16) NOT NULL DEFAULT '' COMMENT '',
+	`note` text COMMENT '',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -886,9 +886,9 @@ CREATE TABLE IF NOT EXISTS `register` (
 -- TABLE search
 --
 CREATE TABLE IF NOT EXISTS `search` (
-	`id` int(11) NOT NULL auto_increment,
-	`uid` int(11) NOT NULL DEFAULT 0,
-	`term` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`term` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -897,10 +897,10 @@ CREATE TABLE IF NOT EXISTS `search` (
 -- TABLE session
 --
 CREATE TABLE IF NOT EXISTS `session` (
-	`id` bigint(20) unsigned NOT NULL auto_increment,
-	`sid` varbinary(255) NOT NULL DEFAULT '',
-	`data` text,
-	`expire` int(10) unsigned NOT NULL DEFAULT 0,
+	`id` bigint NOT NULL auto_increment COMMENT '',
+	`sid` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
+	`data` text COMMENT '',
+	`expire` int NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `sid` (`sid`(64)),
 	 INDEX `expire` (`expire`)
@@ -910,11 +910,11 @@ CREATE TABLE IF NOT EXISTS `session` (
 -- TABLE sign
 --
 CREATE TABLE IF NOT EXISTS `sign` (
-	`id` int(10) unsigned NOT NULL auto_increment,
-	`iid` int(10) unsigned NOT NULL DEFAULT 0,
-	`signed_text` mediumtext,
-	`signature` text,
-	`signer` varchar(255) NOT NULL DEFAULT '',
+	`id` int NOT NULL auto_increment COMMENT '',
+	`iid` int NOT NULL DEFAULT 0 COMMENT '',
+	`signed_text` mediumtext COMMENT '',
+	`signature` text COMMENT '',
+	`signer` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `iid` (`iid`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -923,18 +923,18 @@ CREATE TABLE IF NOT EXISTS `sign` (
 -- TABLE term
 --
 CREATE TABLE IF NOT EXISTS `term` (
-	`tid` int(10) unsigned NOT NULL auto_increment,
-	`oid` int(10) unsigned NOT NULL DEFAULT 0,
-	`otype` tinyint(3) unsigned NOT NULL DEFAULT 0,
-	`type` tinyint(3) unsigned NOT NULL DEFAULT 0,
-	`term` varchar(255) NOT NULL DEFAULT '',
-	`url` varchar(255) NOT NULL DEFAULT '',
-	`guid` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`global` tinyint(1) NOT NULL DEFAULT 0,
-	`aid` int(10) unsigned NOT NULL DEFAULT 0,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`tid` int NOT NULL auto_increment COMMENT '',
+	`oid` int NOT NULL DEFAULT 0 COMMENT '',
+	`otype` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`type` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`term` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`aid` int NOT NULL DEFAULT 0 COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`tid`),
 	 INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`(32)),
 	 INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`(32),`global`,`created`),
@@ -946,32 +946,32 @@ CREATE TABLE IF NOT EXISTS `term` (
 -- TABLE thread
 --
 CREATE TABLE IF NOT EXISTS `thread` (
-	`iid` int(10) unsigned NOT NULL DEFAULT 0,
-	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`contact-id` int(11) unsigned NOT NULL DEFAULT 0,
-	`gcontact-id` int(11) unsigned NOT NULL DEFAULT 0,
-	`owner-id` int(11) unsigned NOT NULL DEFAULT 0,
-	`author-id` int(11) unsigned NOT NULL DEFAULT 0,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`wall` tinyint(1) NOT NULL DEFAULT 0,
-	`private` tinyint(1) NOT NULL DEFAULT 0,
-	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
-	`moderated` tinyint(1) NOT NULL DEFAULT 0,
-	`visible` tinyint(1) NOT NULL DEFAULT 0,
-	`spam` tinyint(1) NOT NULL DEFAULT 0,
-	`starred` tinyint(1) NOT NULL DEFAULT 0,
-	`ignored` tinyint(1) NOT NULL DEFAULT 0,
-	`bookmark` tinyint(1) NOT NULL DEFAULT 0,
-	`unseen` tinyint(1) NOT NULL DEFAULT 1,
-	`deleted` tinyint(1) NOT NULL DEFAULT 0,
-	`origin` tinyint(1) NOT NULL DEFAULT 0,
-	`forum_mode` tinyint(1) NOT NULL DEFAULT 0,
-	`mention` tinyint(1) NOT NULL DEFAULT 0,
-	`network` varchar(32) NOT NULL DEFAULT '',
+	`iid` int NOT NULL DEFAULT 0 COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
+	`contact-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`gcontact-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`owner-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`author-id` int NOT NULL DEFAULT 0 COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`wall` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`private` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`spam` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`starred` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`ignored` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`bookmark` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`unseen` boolean NOT NULL DEFAULT '1' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`origin` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`forum_mode` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`iid`),
 	 INDEX `uid_network_commented` (`uid`,`network`,`commented`),
 	 INDEX `uid_network_created` (`uid`,`network`,`created`),
@@ -990,12 +990,12 @@ CREATE TABLE IF NOT EXISTS `thread` (
 -- TABLE tokens
 --
 CREATE TABLE IF NOT EXISTS `tokens` (
-	`id` varchar(40) NOT NULL,
-	`secret` text,
+	`id` varchar(40) NOT NULL COMMENT '',
+	`secret` text COMMENT '',
 	`client_id` varchar(20) NOT NULL DEFAULT '',
-	`expires` int(11) NOT NULL DEFAULT 0,
-	`scope` varchar(200) NOT NULL DEFAULT '',
-	`uid` int(11) NOT NULL DEFAULT 0,
+	`expires` int NOT NULL DEFAULT 0 COMMENT '',
+	`scope` varchar(200) NOT NULL DEFAULT '' COMMENT '',
+	`uid` mediumint NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
@@ -1003,48 +1003,48 @@ CREATE TABLE IF NOT EXISTS `tokens` (
 -- TABLE user
 --
 CREATE TABLE IF NOT EXISTS `user` (
-	`uid` int(11) NOT NULL auto_increment,
-	`guid` varchar(64) NOT NULL DEFAULT '',
-	`username` varchar(255) NOT NULL DEFAULT '',
-	`password` varchar(255) NOT NULL DEFAULT '',
-	`nickname` varchar(255) NOT NULL DEFAULT '',
-	`email` varchar(255) NOT NULL DEFAULT '',
-	`openid` varchar(255) NOT NULL DEFAULT '',
-	`timezone` varchar(128) NOT NULL DEFAULT '',
-	`language` varchar(32) NOT NULL DEFAULT 'en',
-	`register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`default-location` varchar(255) NOT NULL DEFAULT '',
-	`allow_location` tinyint(1) NOT NULL DEFAULT 0,
-	`theme` varchar(255) NOT NULL DEFAULT '',
-	`pubkey` text,
-	`prvkey` text,
-	`spubkey` text,
-	`sprvkey` text,
-	`verified` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`blocked` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`blockwall` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`hidewall` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`blocktags` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`unkmail` tinyint(1) NOT NULL DEFAULT 0,
-	`cntunkmail` int(11) NOT NULL DEFAULT 10,
-	`notify-flags` int(11) unsigned NOT NULL DEFAULT 65535,
-	`page-flags` int(11) unsigned NOT NULL DEFAULT 0,
-	`account-type` int(11) unsigned NOT NULL DEFAULT 0,
-	`prvnets` tinyint(1) NOT NULL DEFAULT 0,
-	`pwdreset` varchar(255) NOT NULL DEFAULT '',
-	`maxreq` int(11) NOT NULL DEFAULT 10,
-	`expire` int(11) unsigned NOT NULL DEFAULT 0,
-	`account_removed` tinyint(1) NOT NULL DEFAULT 0,
-	`account_expired` tinyint(1) NOT NULL DEFAULT 0,
-	`account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`def_gid` int(11) NOT NULL DEFAULT 0,
-	`allow_cid` mediumtext,
-	`allow_gid` mediumtext,
-	`deny_cid` mediumtext,
-	`deny_gid` mediumtext,
-	`openidserver` text,
+	`uid` mediumint NOT NULL auto_increment COMMENT '',
+	`guid` varchar(64) NOT NULL DEFAULT '' COMMENT '',
+	`username` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`password` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`email` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`openid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`timezone` varchar(128) NOT NULL DEFAULT '' COMMENT '',
+	`language` varchar(32) NOT NULL DEFAULT 'en' COMMENT '',
+	`register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`default-location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`allow_location` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`theme` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`pubkey` text COMMENT '',
+	`prvkey` text COMMENT '',
+	`spubkey` text COMMENT '',
+	`sprvkey` text COMMENT '',
+	`verified` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`blocked` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`blockwall` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`hidewall` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`blocktags` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`unkmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`cntunkmail` int NOT NULL DEFAULT 10 COMMENT '',
+	`notify-flags` smallint unsigned NOT NULL DEFAULT 65535 COMMENT '',
+	`page-flags` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`account-type` tinyint NOT NULL DEFAULT 0 COMMENT '',
+	`prvnets` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`pwdreset` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`maxreq` int NOT NULL DEFAULT 10 COMMENT '',
+	`expire` int NOT NULL DEFAULT 0 COMMENT '',
+	`account_removed` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`account_expired` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`def_gid` int NOT NULL DEFAULT 0 COMMENT '',
+	`allow_cid` mediumtext COMMENT '',
+	`allow_gid` mediumtext COMMENT '',
+	`deny_cid` mediumtext COMMENT '',
+	`deny_gid` mediumtext COMMENT '',
+	`openidserver` text COMMENT '',
 	 PRIMARY KEY(`uid`),
 	 INDEX `nickname` (`nickname`(32))
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -1053,8 +1053,8 @@ CREATE TABLE IF NOT EXISTS `user` (
 -- TABLE userd
 --
 CREATE TABLE IF NOT EXISTS `userd` (
-	`id` int(11) NOT NULL auto_increment,
-	`username` varchar(255) NOT NULL,
+	`id` int NOT NULL auto_increment COMMENT '',
+	`username` varchar(255) NOT NULL COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `username` (`username`(32))
 ) DEFAULT COLLATE utf8mb4_general_ci;
@@ -1063,13 +1063,13 @@ CREATE TABLE IF NOT EXISTS `userd` (
 -- TABLE workerqueue
 --
 CREATE TABLE IF NOT EXISTS `workerqueue` (
-	`id` int(11) NOT NULL auto_increment,
-	`parameter` text,
-	`priority` tinyint(3) unsigned NOT NULL DEFAULT 0,
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`pid` int(11) NOT NULL DEFAULT 0,
-	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	`done` tinyint(1) NOT NULL DEFAULT 0,
+	`id` int NOT NULL auto_increment COMMENT 'Auto incremented worker task id',
+	`parameter` text COMMENT 'Task command',
+	`priority` tinyint NOT NULL DEFAULT 0 COMMENT 'Task priority',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
+	`pid` int NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',
+	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Execution date',
+	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked when the task was done, will be deleted later',
 	 PRIMARY KEY(`id`),
 	 INDEX `pid` (`pid`),
 	 INDEX `parameter` (`parameter`(64)),
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 1603ee5530..9e0f3eeacd 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -129,8 +129,8 @@ class DBStructure {
 		if (DBM::is_result($structures)) {
 			foreach ($structures AS $field) {
 				// Replace the default size values so that we don't have to define them
-				$search = ['tinyint(1)', 'tinyint(4)', 'smallint(6)', 'mediumint(9)', 'bigint(20)', 'int(11)'];
-				$replace = ['boolean', 'tinyint', 'smallint', 'mediumint', 'bigint', 'int'];
+				$search = ['tinyint(1)', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(9)', 'bigint(20)', 'int(11)'];
+				$replace = ['boolean', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint', 'bigint', 'int'];
 				$field["Type"] = str_replace($search, $replace, $field["Type"]);
 
 				$fielddata[$field["Field"]]["type"] = $field["Type"];