Fixed some reobfuscation issues, will probably switch to BON