tweaks on property handling