diff --git a/user/kvmctl.h b/user/kvmctl.h
index b14cb45..7d8fed5 100644
--- a/user/kvmctl.h
+++ b/user/kvmctl.h
@@ -132,23 +132,6 @@ int kvm_create(kvm_context_t kvm,
 int kvm_run(kvm_context_t kvm, int vcpu);
 
 /*!
- * \brief Read VCPU registers
- *
- * This gets the GP registers from the VCPU and outputs them
- * into a kvm_regs structure
- *
- * \note This function returns a \b copy of the VCPUs registers.\n
- * If you wish to modify the VCPUs GP registers, you should call kvm_set_regs()
- *
- * \param kvm Pointer to the current kvm_context
- * \param vcpu Which virtual CPU should get dumped
- * \param regs Pointer to a kvm_regs which will be populated with the VCPUs
- * registers values
- * \return 0 on success
- */
-
-
-/*!
  * \brief Get interrupt flag from on last exit to userspace
  *
  * This gets the CPU interrupt flag as it was on the last exit to userspace.
@@ -158,6 +141,7 @@ int kvm_run(kvm_context_t kvm, int vcpu);
  * \return interrupt flag value (0 or 1)
  */
 int kvm_get_interrupt_flag(kvm_context_t kvm, int vcpu);
+
 /*!
  * \brief Get the value of the APIC_BASE msr as of last exit to userspace
  *
@@ -168,6 +152,7 @@ int kvm_get_interrupt_flag(kvm_context_t kvm, int vcpu);
  * \return APIC_BASE msr contents
  */
 uint64_t kvm_get_apic_base(kvm_context_t kvm, int vcpu);
+
 /*!
  * \brief Check if a vcpu is ready for interrupt injection
  *
@@ -178,6 +163,7 @@ uint64_t kvm_get_apic_base(kvm_context_t kvm, int vcpu);
  * \return boolean indicating interrupt injection readiness
  */
 int kvm_is_ready_for_interrupt_injection(kvm_context_t kvm, int vcpu);
+
 /*!
  * \brief Set up cr8 for next time the vcpu is executed
  *
@@ -190,6 +176,21 @@ int kvm_is_ready_for_interrupt_injection(kvm_context_t kvm, int vcpu);
  */
 void kvm_set_cr8(kvm_context_t kvm, int vcpu, uint64_t cr8);
 
+/*!
+ * \brief Read VCPU registers
+ *
+ * This gets the GP registers from the VCPU and outputs them
+ * into a kvm_regs structure
+ *
+ * \note This function returns a \b copy of the VCPUs registers.\n
+ * If you wish to modify the VCPUs GP registers, you should call kvm_set_regs()
+ *
+ * \param kvm Pointer to the current kvm_context
+ * \param vcpu Which virtual CPU should get dumped
+ * \param regs Pointer to a kvm_regs which will be populated with the VCPUs
+ * registers values
+ * \return 0 on success
+ */
 int kvm_get_regs(kvm_context_t kvm, int vcpu, struct kvm_regs *regs);
 
 /*!
@@ -285,6 +286,7 @@ int kvm_set_msrs(kvm_context_t, int vcpu, struct kvm_msr_entry *msrs, int n);
  * \return 0 on success
  */
 int kvm_inject_irq(kvm_context_t kvm, int vcpu, unsigned irq);
+
 int kvm_guest_debug(kvm_context_t, int vcpu, struct kvm_debug_guest *dbg);
 
 /*!
@@ -353,7 +355,7 @@ void kvm_destroy_phys_mem(kvm_context_t, unsigned long phys_start,
 int kvm_get_dirty_pages(kvm_context_t, int slot, void *buf);
 
 
-/*
+/*!
  * \brief Create a memory alias
  *
  * Aliases a portion of physical memory to another portion.  If the guest
@@ -364,7 +366,7 @@ int kvm_create_memory_alias(kvm_context_t, int slot,
 			    uint64_t phys_start, uint64_t len,
 			    uint64_t target_phys);
 
-/*
+/*!
  * \brief Destroy a memory alias
  *
  * Removes an alias created with kvm_create_memory_alias().
@@ -372,7 +374,7 @@ int kvm_create_memory_alias(kvm_context_t, int slot,
 int kvm_destroy_memory_alias(kvm_context_t, int slot);
 
 /*!
- * \brief get a bitmap of guest ram pages which are allocated to the guest.
+ * \brief Get a bitmap of guest ram pages which are allocated to the guest.
  *
  * \param kvm Pointer to the current kvm_context
  * \param slot Memory slot number