add some tagging stuff, fix property ops