Fixed strings used for equals, added quotes when needed