Index: kernel/arch/sparc64/src/drivers/niagara.c
===================================================================
--- kernel/arch/sparc64/src/drivers/niagara.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
+++ kernel/arch/sparc64/src/drivers/niagara.c	(revision 8e33e1dcb1b815d80298a0dd8ac7a357701e5f55)
@@ -52,6 +52,8 @@
 #include <genarch/srln/srln.h>
 
+/* polling interval in miliseconds */
 #define POLL_INTERVAL  10000
 
+/* device instance */
 static niagara_instance_t *instance = NULL;
 
@@ -124,4 +126,5 @@
 static void niagara_poll(niagara_instance_t *instance)
 {
+	/* print any pending characters from the shared buffer to the console */
 	while (output_buffer.read_ptr != output_buffer.write_ptr) {
 		do_putchar(output_buffer.data[output_buffer.read_ptr]);
@@ -132,8 +135,11 @@
 	uint64_t c;
 
+	/* read character from keyboard, send it to upper layers of HelenOS */
 	if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == EOK) {
 		if (!silent) {
+			/* kconsole active, send the character to kernel */
 			indev_push_character(instance->srlnin, c);
 		} else {
+			/* kconsole inactive, send the character to uspace driver */
 			input_buffer.data[input_buffer.write_ptr] = (char) c;
 			input_buffer.write_ptr =
@@ -141,5 +147,4 @@
 		}
 	}
-
 }
 
@@ -177,5 +182,9 @@
 
 	instance->srlnin = NULL;
-	sysinfo_set_item_val("fb.kind", NULL, 5);
+
+	output_buffer.read_ptr = 0;
+	output_buffer.write_ptr = 0;
+	input_buffer.write_ptr = 0;
+	input_buffer.read_ptr = 0;
 
 	/*
@@ -184,8 +193,6 @@
 	 * buffers.
  	 */
-	output_buffer.read_ptr = 0;
-	output_buffer.write_ptr = 0;
-	input_buffer.write_ptr = 0;
-	input_buffer.read_ptr = 0;
+
+	sysinfo_set_item_val("fb.kind", NULL, 5);
 
 	sysinfo_set_item_val("niagara.outbuf.address", NULL,
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
+++ uspace/app/init/init.c	(revision 8e33e1dcb1b815d80298a0dd8ac7a357701e5f55)
@@ -263,8 +263,8 @@
 	}
 	
-	//spawn("/srv/fhc");
-	//spawn("/srv/obio");
-	//srv_start("/srv/i8042");
-	//srv_start("/srv/c_mouse");
+	spawn("/srv/fhc");
+	spawn("/srv/obio");
+	srv_start("/srv/i8042");
+	srv_start("/srv/c_mouse");
 
 	spawn("/srv/fb");
Index: uspace/lib/libc/arch/sparc64/src/thread_entry.s
===================================================================
--- uspace/lib/libc/arch/sparc64/src/thread_entry.s	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
+++ uspace/lib/libc/arch/sparc64/src/thread_entry.s	(revision 8e33e1dcb1b815d80298a0dd8ac7a357701e5f55)
@@ -39,5 +39,4 @@
 	#
 
-	# MH
 	#save %sp, -176, %sp
 	#flushw
Index: uspace/lib/libc/generic/thread.c
===================================================================
--- uspace/lib/libc/generic/thread.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
+++ uspace/lib/libc/generic/thread.c	(revision 8e33e1dcb1b815d80298a0dd8ac7a357701e5f55)
@@ -41,5 +41,4 @@
 #include <string.h>
 #include <async.h>
-#include <stdio.h>
 
 #ifndef THREAD_INITIAL_STACK_PAGES_NO
@@ -63,6 +62,4 @@
 	__tcb_set(f->tcb);
 
-	// MH
-	printf("uarg: %lx\n", uarg);
 	uarg->uspace_thread_function(uarg->uspace_thread_arg);
 	/* XXX: we cannot free the userspace stack while running on it */
Index: uspace/srv/hid/kbd/generic/kbd.c
===================================================================
--- uspace/srv/hid/kbd/generic/kbd.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
+++ uspace/srv/hid/kbd/generic/kbd.c	(revision 8e33e1dcb1b815d80298a0dd8ac7a357701e5f55)
@@ -219,5 +219,4 @@
 		cir_service = SERVICE_OBIO;
 	
-/*
 	if (cir_service) {
 		while (cir_phone < 0) {
@@ -226,6 +225,4 @@
 		}
 	}
-*/
-printf("KBD driver!!!\n");
 	
 	/* Initialize port driver. */
Index: uspace/srv/hid/kbd/port/niagara.c
===================================================================
--- uspace/srv/hid/kbd/port/niagara.c	(revision 86018c11a1e682f179cb1ce268bf18b901b8a78b)
+++ uspace/srv/hid/kbd/port/niagara.c	(revision 8e33e1dcb1b815d80298a0dd8ac7a357701e5f55)
@@ -67,4 +67,5 @@
 	*input_buffer_t;
 
+/* virtual address of the shared buffer */
 input_buffer_t input_buffer;
 
@@ -73,6 +74,6 @@
 
 /**
- * Initializes the SGCN driver.
- * Maps the physical memory (SRAM) and creates the polling thread. 
+ * Initializes the Niagara driver.
+ * Maps the shared buffer and creates the polling thread. 
  */
 int kbd_port_init(void)
@@ -117,6 +118,6 @@
 
 /**
- * Handler of the "key pressed" event. Reads codes of all the pressed keys from
- * the buffer. 
+ * Called regularly by the polling thread. Reads codes of all the
+ * pressed keys from the buffer. 
  */
 static void niagara_key_pressed(void)