Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 1bb37660771ac9b30c844daebd5d607ac7468abe)
+++ kernel/generic/src/console/kconsole.c	(revision 5d67baaf93a59a7584952e5f044264cc6662ca3b)
@@ -170,5 +170,5 @@
 
 /** Try to find a command beginning with prefix */
-static const char * cmdtab_search_one(const char *name,link_t **startpos)
+static const char *cmdtab_search_one(const char *name,link_t **startpos)
 {
 	size_t namelen = strlen(name);
@@ -204,5 +204,5 @@
 static int cmdtab_compl(char *name)
 {
-	static char output[MAX_SYMBOL_NAME+1];
+	static char output[MAX_SYMBOL_NAME + 1];
 	link_t *startpos = NULL;
 	const char *foundtxt;
@@ -214,5 +214,5 @@
 		startpos = startpos->next;
 		if (!found)
-			strncpy(output, foundtxt, strlen(foundtxt)+1);
+			strncpy(output, foundtxt, strlen(foundtxt) + 1);
 		else {
 			for (i = 0; output[i] && foundtxt[i] &&
@@ -241,9 +241,10 @@
 }
 
-static char * clever_readline(const char *prompt, chardev_t *input)
+//char *clever_readline(const char *prompt, chardev_t *input);
+static char *clever_readline(const char *prompt, chardev_t *input)
 {
 	static int histposition = 0;
 
-	static char tmp[MAX_CMDLINE+1];
+	static char tmp[MAX_CMDLINE + 1];
 	int curlen = 0, position = 0;
 	char *current = history[histposition];
@@ -258,5 +259,6 @@
 			putchar(c);
 			break;
-		} if (c == '\b') { /* Backspace */
+		}
+		if (c == '\b') { /* Backspace */
 			if (position == 0)
 				continue;
@@ -544,5 +546,6 @@
 			strncpy(buf, (const char *) &cmdline[start],
 			    min((end - start) + 2, cmd->argv[i].len));
-			buf[min((end - start) + 1, cmd->argv[i].len - 1)] = '\0';
+			buf[min((end - start) + 1, cmd->argv[i].len - 1)] =
+			    '\0';
 			break;
 		case ARG_TYPE_INT: 
@@ -561,6 +564,6 @@
 				cmd->argv[i].intval = (unative_t) buf;
 				cmd->argv[i].vartype = ARG_TYPE_STRING;
-			} else if (!parse_int_arg(cmdline + start, end - start + 1, 
-			    &cmd->argv[i].intval)) {
+			} else if (!parse_int_arg(cmdline + start,
+			    end - start + 1, &cmd->argv[i].intval)) {
 				cmd->argv[i].vartype = ARG_TYPE_INT;
 			} else {
Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision 1bb37660771ac9b30c844daebd5d607ac7468abe)
+++ kernel/generic/src/main/main.c	(revision 5d67baaf93a59a7584952e5f044264cc6662ca3b)
@@ -62,4 +62,5 @@
 #include <main/version.h>
 #include <console/kconsole.h>
+#include <console/console.h>
 #include <cpu.h>
 #include <align.h>
@@ -81,5 +82,5 @@
 #include <smp/smp.h>
 #include <ddi/ddi.h>
-#include <console/console.h>
+
 
 /** Global configuration structure. */
@@ -236,6 +237,6 @@
 	LOG_EXEC(slab_enable_cpucache());
 	
-	printf("Detected %" PRIc " CPU(s), %" PRIu64" MB free memory\n",
-		config.cpu_count, SIZE2MB(zone_total_size()));
+	printf("Detected %" PRIc " CPU(s), %" PRIu64" MiB free memory\n",
+	    config.cpu_count, SIZE2MB(zone_total_size()));
 	
 	LOG_EXEC(cpu_init());
@@ -253,6 +254,6 @@
 		for (i = 0; i < init.cnt; i++)
 			printf("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
-			    "].size=%#" PRIs "\n", i, init.tasks[i].addr,
-			    i, init.tasks[i].size);
+			    "].size=%#" PRIs "\n", i, init.tasks[i].addr, i,
+			    init.tasks[i].size);
 	} else
 		printf("No init binaries found\n");