added logical AND and OR and de-verbose'd some definitions