diff --git a/kernel/main.c b/kernel/main.c
index a936fd3..5d7ad49 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -13,7 +13,9 @@ main()
   if(cpuid() == 0){
     consoleinit();
     printfinit();
-    printf("hart %d starting\n", cpuid());
+    printf("\n");
+    printf("xv6 kernel is booting\n");
+    printf("\n");
     kinit();         // physical page allocator
     kvminit();       // create kernel page table
     kvminithart();   // turn on paging
diff --git a/kernel/trampoline.S b/kernel/trampoline.S
index 24499d9..f47c3ff 100644
--- a/kernel/trampoline.S
+++ b/kernel/trampoline.S
@@ -75,8 +75,8 @@ uservec:
 
         # restore kernel page table from p->tf->kernel_satp
         ld t1, 0(a0)
-	sfence.vma zero, zero
         csrw satp, t1
+        sfence.vma zero, zero
 
         # a0 is no longer valid, since the kernel page
         # table does not specially map p->td.
@@ -89,12 +89,12 @@ userret:
         # userret(TRAPFRAME, pagetable)
         # switch from kernel to user.
         # usertrapret() calls here.
-	# a0: TRAPFRAME, in user page table
+        # a0: TRAPFRAME, in user page table
         # a1: user page table, for satp
 
-	# switch to the user page table.
-	sfence.vma zero, zero
+        # switch to the user page table.
         csrw satp, a1
+        sfence.vma zero, zero
 
         # put the saved user a0 in sscratch, so we
         # can swap it with our a0 (TRAPFRAME) in the last step.