Fix #512; change either/or where both are allowed

Changed occurrences of "either A or B"  to "either A, B or both", where functionally appropriate.