Miscelanious fixes, it’s compilable now but Welcome Text generation still needs work