added AND and OR combinations to prosemaker conditonals