Fixed mail issues
Merged into syntax branch
Tweaks to refactor and implement intset_t setprop