Undo changes to if statements as requested by vmarmol. Fix typos in my changes.