moving some methods from AndOr to Or as they should belong there
rename some methods to better display their usage
merged some methods and deleted some obsolete methods