made changes suggested obfuscated made and fix unix build