Added x86 support, fixed setup errors

Now correctly subclasses existing Property handler.