Fixed fire bugs and made it obfuscation proof.