Expanded the property compare part with string comparison
Some very minor fixex