Final touches on the API, the obfuscation bug should be fixed (still needs testing).