did a whole lot of previous patching and adding debug comments
And here come the changes