Improve links and obfuscation