Minor changed the labels
Updates to boolean logic
Again a minor fix for boolean logic