diff --git a/pengine/pengine.c b/pengine/pengine.c
index 0d9224b218..45c37b4b6c 100644
--- a/pengine/pengine.c
+++ b/pengine/pengine.c
@@ -1,297 +1,297 @@
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <crm_internal.h>
 
 #include <sys/param.h>
 
 #include <crm/crm.h>
 #include <crm/cib.h>
 #include <crm/msg_xml.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 
 #include <glib.h>
 
 #include <crm/pengine/status.h>
 #include <pengine.h>
 #include <allocate.h>
 #include <lib/pengine/utils.h>
 #include <utils.h>
 
 xmlNode * do_calculations(
 	pe_working_set_t *data_set, xmlNode *xml_input, ha_time_t *now);
 
 gboolean show_scores = FALSE;
 int scores_log_level = LOG_DEBUG_2;
 gboolean show_utilization = FALSE;
 int utilization_log_level = LOG_DEBUG_2;
 extern int transition_id;
 
 #define get_series() 	was_processing_error?1:was_processing_warning?2:3
 
 typedef struct series_s 
 {
 	int id;
 	const char *name;
 	const char *param;
 	int wrap;
 } series_t;
 
 series_t series[] = {
 	{ 0, "pe-unknown", "_dont_match_anything_", -1 },
 	{ 0, "pe-error",   "pe-error-series-max", -1 },
 	{ 0, "pe-warn",    "pe-warn-series-max", 200 },
 	{ 0, "pe-input",   "pe-input-series-max", 400 },
 };
 
 gboolean
 process_pe_message(xmlNode *msg, xmlNode *xml_data, IPC_Channel *sender)
 {
 	gboolean send_via_disk = FALSE;
 	const char *sys_to = crm_element_value(msg, F_CRM_SYS_TO);
 	const char *op = crm_element_value(msg, F_CRM_TASK);
 	const char *ref = crm_element_value(msg, XML_ATTR_REFERENCE);
 
 	crm_debug_3("Processing %s op (ref=%s)...", op, ref);
 	
 	if(op == NULL){
 		/* error */
 
 	} else if(strcasecmp(op, CRM_OP_HELLO) == 0) {
 		/* ignore */
 		
 	} else if(safe_str_eq(crm_element_value(msg, F_CRM_MSG_TYPE),
 			      XML_ATTR_RESPONSE)) {
 		/* ignore */
 		
 	} else if(sys_to == NULL || strcasecmp(sys_to, CRM_SYSTEM_PENGINE) != 0) {
 		crm_debug_3("Bad sys-to %s", crm_str(sys_to));
 		return FALSE;
 		
 	} else if(strcasecmp(op, CRM_OP_PECALC) == 0) {
 		int seq = -1;
 		int series_id = 0;
 		int series_wrap = 0;
 		char *filename = NULL;
 		char *graph_file = NULL;
 		const char *value = NULL;
 		pe_working_set_t data_set;
 		xmlNode *converted = NULL;
 		xmlNode *reply = NULL;
 		gboolean process = TRUE;
 #if HAVE_BZLIB_H
 		gboolean compress = TRUE;
 #else
 		gboolean compress = FALSE;
 #endif
 
 		crm_config_error = FALSE;
 		crm_config_warning = FALSE;	
 		
 		was_processing_error = FALSE;
 		was_processing_warning = FALSE;
 
 		graph_file = crm_strdup(CRM_STATE_DIR"/graph.XXXXXX");
 		graph_file = mktemp(graph_file);
 
 		set_working_set_defaults(&data_set);
 
 		converted = copy_xml(xml_data);
 		if(cli_config_update(&converted, NULL, TRUE) == FALSE) {
 		    data_set.graph = create_xml_node(NULL, XML_TAG_GRAPH);
 		    crm_xml_add_int(data_set.graph, "transition_id", 0);
 		    crm_xml_add_int(data_set.graph, "cluster-delay", 0);
 		    process = FALSE;
 		}
 
 		if(process) {
 		    do_calculations(&data_set, converted, NULL);
 		}
 		
 		series_id = get_series();
 		series_wrap = series[series_id].wrap;
 		value = pe_pref(data_set.config_hash, series[series_id].param);
 
 		if(value != NULL) {
 			series_wrap = crm_int_helper(value, NULL);
 			if(errno != 0) {
 				series_wrap = series[series_id].wrap;
 			}
 
 		} else {
 			crm_config_warn("No value specified for cluster"
 					" preference: %s",
 					series[series_id].param);
 		}		
 
 		seq = get_last_sequence(PE_STATE_DIR, series[series_id].name);	
 		
 		data_set.input = NULL;
 		reply = create_reply(msg, data_set.graph);
 		CRM_ASSERT(reply != NULL);
 
 		filename = generate_series_filename(
 			PE_STATE_DIR, series[series_id].name, seq, compress);
 		crm_xml_add(reply, F_CRM_TGRAPH_INPUT, filename);
 		crm_xml_add_int(reply, "graph-errors", was_processing_error);
 		crm_xml_add_int(reply, "graph-warnings", was_processing_warning);
 		crm_xml_add_int(reply, "config-errors", crm_config_error);
 		crm_xml_add_int(reply, "config-warnings", crm_config_warning);
 
 		if(send_ipc_message(sender, reply) == FALSE) {
 		    if(sender && sender->ops->get_chan_status(sender) == IPC_CONNECT) {
 			send_via_disk = TRUE;
 			crm_err("Answer could not be sent via IPC, send via the disk instead");	           
-			crm_info("Writing the TE graph to %s", graph_file);
+			crm_notice("Writing the TE graph to %s", graph_file);
 			if(write_xml_file(data_set.graph, graph_file, FALSE) < 0) {
-				crm_err("TE graph could not be written to disk");
+			    crm_err("TE graph could not be written to disk");
 			}
 		    } else {
 			crm_info("Peer disconnected, discarding transition graph");
 		    }
 		}
 		
 		free_xml(reply);
 		cleanup_alloc_calculations(&data_set);
 
 		if(series_wrap != 0) {
 		    write_xml_file(xml_data, filename, compress);
 		    write_last_sequence(PE_STATE_DIR, series[series_id].name,
 					seq+1, series_wrap);
 		}
 		
 		if(was_processing_error) {
 			crm_err("Transition %d:"
 				" ERRORs found during PE processing."
 				" PEngine Input stored in: %s",
 				transition_id, filename);
 
 		} else if(was_processing_warning) {
 			crm_warn("Transition %d:"
 				 " WARNINGs found during PE processing."
 				 " PEngine Input stored in: %s",
 				 transition_id, filename);
 
 		} else {
-			crm_info("Transition %d: PEngine Input stored in: %s",
-				 transition_id, filename);
+			crm_notice("Transition %d: PEngine Input stored in: %s",
+				   transition_id, filename);
 		}
 
 		if(crm_config_error) {
-			crm_info("Configuration ERRORs found during PE processing."
-			       "  Please run \"crm_verify -L\" to identify issues.");
+			crm_notice("Configuration ERRORs found during PE processing."
+				   "  Please run \"crm_verify -L\" to identify issues.");
 
 		} else if(crm_config_warning) {
-			crm_info("Configuration WARNINGs found during PE processing."
-				 "  Please run \"crm_verify -L\" to identify issues.");
+			crm_notice("Configuration WARNINGs found during PE processing."
+				   "  Please run \"crm_verify -L\" to identify issues.");
 		}
 
 		if(send_via_disk) {
 			reply = create_reply(msg, NULL);
 			crm_xml_add(reply, F_CRM_TGRAPH, graph_file);
 			crm_xml_add(reply, F_CRM_TGRAPH_INPUT, filename);
 			CRM_ASSERT(reply != NULL);
 			if(send_ipc_message(sender, reply) == FALSE) {
 				crm_err("Answer could not be sent");
 			}
 			free_xml(reply);
 		}
 
 		free_xml(converted);
 		crm_free(graph_file);
 		crm_free(filename);
 		
 	} else if(strcasecmp(op, CRM_OP_QUIT) == 0) {
 		crm_warn("Received quit message, terminating");
 		exit(0);
 	}
 	
 	return TRUE;
 }
 
 xmlNode *
 do_calculations(pe_working_set_t *data_set, xmlNode *xml_input, ha_time_t *now)
 {
 	GListPtr gIter = NULL;
-	int rsc_log_level = LOG_NOTICE;
+	int rsc_log_level = LOG_INFO;
 /*	pe_debug_on(); */
 
 	CRM_ASSERT(xml_input || is_set(data_set->flags, pe_flag_have_status));
 	
 	if(is_set(data_set->flags, pe_flag_have_status) == FALSE) {
 	    set_working_set_defaults(data_set);
 	    data_set->input = xml_input;
 	    data_set->now = now;
 	    if(data_set->now == NULL) {
 		data_set->now = new_ha_date(TRUE);
 	    }
 	} else {
 	    crm_trace("Already have status - reusing");
 	}
 
 	crm_debug_5("Calculate cluster status");		  
 	stage0(data_set);
 	
 	gIter = data_set->resources;
 	for(; gIter != NULL; gIter = gIter->next) {
 	    resource_t *rsc = (resource_t*)gIter->data;
 	    
 	    if(is_set(rsc->flags, pe_rsc_orphan) && rsc->role == RSC_ROLE_STOPPED) {
 		continue;
 	    }
 	    rsc->fns->print(rsc, NULL, pe_print_log, &rsc_log_level);
 	}
 
 	crm_trace("Applying placement constraints");	
 	stage2(data_set);
 
 	crm_trace("Create internal constraints");
 	stage3(data_set);
 
 	crm_trace("Check actions");
 	stage4(data_set);	
 	
 	crm_trace("Allocate resources");
 	stage5(data_set);
 
 	crm_trace("Processing fencing and shutdown cases");
 	stage6(data_set);
 	
 	crm_trace("Applying ordering constraints");
 	stage7(data_set);
 
 	crm_trace("Create transition graph");
 	stage8(data_set);
 
 	crm_trace("=#=#=#=#= Summary =#=#=#=#=");
 	crm_trace("\t========= Set %d (Un-runnable) =========", -1);
 	if(crm_log_level > LOG_DEBUG) {
 	    gIter = data_set->actions;
 	    for(; gIter != NULL; gIter = gIter->next) {
 		action_t *action = (action_t*)gIter->data;
 		if(is_set(action->flags, pe_action_optional) == FALSE
 		   && is_set(action->flags, pe_action_runnable) == FALSE
 		   && is_set(action->flags, pe_action_pseudo) == FALSE) {
 		    log_action(LOG_DEBUG_2, "\t", action, TRUE);
 		}
 	    }
 	}
 	
 	return data_set->graph;
 }