Updated version numbers and cleaned up kernel.cpp a bit