Patching a patch that messed up a few things on the OS side.. :-/

Should be a-ok after I'm done..transparent to you guys.