updates to add variables, satisfies all/any and comments