Resolved pushed merge conflict -_- fixed a few things and made one last reference (key xor part)