Fix: Minor fixes withing the kernel, and prepares for more features

Signed-Off By: Daniel Henry <daniel@homegrownhacker.com>