bug fixes and data obfuscation support