Properties Issue

Changed else if’s to ifs and changed null to true for applicable
properties