Fixed a few bugs. Handling of PASSIVE properties should now be fine.