diff --git a/heartbeat/lxc b/heartbeat/lxc
index cdeb82a13..ae7572863 100755
--- a/heartbeat/lxc
+++ b/heartbeat/lxc
@@ -1,315 +1,297 @@
 #!/bin/bash
 # Should now conform to guidlines: http://www.linux-ha.org/doc/dev-guides/ra-dev-guide.html
 #
 #	LXC (Linux Containers) OCF RA. 
 #	Used to cluster enable the start, stop and monitoring of a LXC container.
 #
 # Copyright (c) 2011 AkurIT.com.au, Darren Thompson
 #                    All Rights Reserved.
 #
 # Without limiting the rights of the original copyright holders
 # This resource is licensed under GPL version 2
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 
 # OCF instance parameters
 #       OCF_RESKEY_LXC_CNAME
 #       OCF_RESKEY_LXC_BCP
 #	OCF_RESKEY_LXC_BRP
 #       OCF_RESKEY_LXC_CF_FILENAME
 #
 # Whilst testing, fix these values so that the OCF can run from command line
 # This does not conform to the guidlines, so each line should be prefixed with "#" in production
 #
 #	OCF_RESKEY_LXC_CNAME_default="test1"
 #	OCF_RESKEY_LXC_BCP_default="/etc/lxc"
 #	OCF_RESKEY_LXC_BRP_default="/srv/lxc"
 #	OCF_RESKEY_LXC_CF_FILENAME="config"
 #	: ${OCF_RESKEY_LXC_CNAME=${OCF_RESKEY_LXC_CNAME_default}}
 #	: ${OCF_RESKEY_LXC_BCP=${OCF_RESKEY_LXC_BCP_default}}
 #	: ${OCF_RESKEY_LXC_BRP=${OCF_RESKEY_LXC_BRP_default}}
 #	: ${OCF_RESKEY_LXC_CF_FILENAME=${OCF_RESKEY_LXC_CF_FILENAME}}
 #	OCF_ROOT="/usr/lib/ocf"
 #	OCF_RESKEY_CRM_meta_globally_unique="true"
 #	OCF_RESKEY_stop_timeout=30000
 #
 
 
 # Initialization:
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 # Set default trans_res_state (temporary file to "flag" if resource was stated but not stopped)
 trans_res_state="${HA_RSCTMP}/LXC_${OCF_RESKEY_LXC_CNAME}-${OCF_RESOURCE_INSTANCE}.state"
 
 # It would be "Bad" if the container were to be run on more than one node, using lock file in shared configration directory to prevent it.
 LOCKFILE="${OCF_RESKEY_LXC_BCP}/${OCF_RESKEY_LXC_CNAME}/${OCF_RESKEY_LXC_CNAME}.lock"
 ## ocf_release_lock_on_exit $LOCKFILE # does not work as I would expect ti too :-( #
 
 # put this here as it's so long it gets messy later!!!
 STARTCMD="screen -dmS ${OCF_RESKEY_LXC_CNAME} lxc-start -f ${OCF_RESKEY_LXC_CF_FILENAME} -n ${OCF_RESKEY_LXC_CNAME}"
 
 # confirm cgroup_mounted
 	# Various possible overrides to cgroup mount point.
 	# If kernel supplies cgroup mount point, prefer it.
 	CGROUP_MOUNT_POINT=/var/run/lxc/cgroup
 	CGROUP_MOUNT_NAME=lxc
 	CGROUP_MOUNTED=false
 	[[ -d /sys/fs/cgroup ]] && CGROUP_MOUNT_POINT=/sys/fs/cgroup CGROUP_MOUNT_NAME=cgroup
 	# If cgroup already mounted, use it no matter where it is.
 	# If multiple cgroup mounts, prefer the one named lxc if any.
 	eval `awk 'BEGIN{P="";N=""}END{print("cgmp="P" cgmn="N)}($3=="cgroup"){N=$1;P=$2;if($1="lxc")exit}' /proc/mounts`
 	[[ "$cgmn" && "$cgmp" && -d "$cgmp" ]] && CGROUP_MOUNT_POINT=$cgmp CGROUP_MOUNT_NAME=$cgmn CGROUP_MOUNTED=true
 	CGROUP_RELEASE_AGENT="/usr/sbin/lxc_cgroup_release_agent"
 	$CGROUP_MOUNTED || {
 		[[ -d $CGROUP_MOUNT_POINT ]] || mkdir -p $CGROUP_MOUNT_POINT
 		mount -t cgroup $CGROUP_MOUNT_NAME $CGROUP_MOUNT_POINT
 	}
 	echo 1 >${CGROUP_MOUNT_POINT}/notify_on_release
 
 # don't exit on TERM, the lrmd should handle that
 #trap sigterm_handler TERM
 #sigterm_handler() {
 #	ocf_log info "Cluster resource detected TERM signal, Please use cluster resource manager to control resources"
 #	return
 #}
 
 meta_data() {
 cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="lxc" version="0.1">
 <version>0.1</version>
 <longdesc lang="en">This is derived from the generic OCF RA, to manage LXC containers. It allow LXC continers to be managed by the cluster</longdesc>
 <shortdesc lang="en">Manages LXC containers</shortdesc>
 
 <parameters>
 <parameter name="LXC_CNAME" required="true" unique="true">
 <longdesc lang="en">The unique name for this 'Container Instance' e.g. 'test1'.</longdesc>
 <shortdesc lang="en">Container Name</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="LXC_BCP" required="true" unique="false">
 <longdesc lang="en">The path to the directories holding each containers configuration files e.g. '/etc/lxc'.</longdesc>
 <shortdesc lang="en">Full path to the config root</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="LXC_BRP" required="true" unique="false">
 <longdesc lang="en">The path to the directories holding each containers "root" filesystem e.g. '/srv/lxc'.</longdesc>
 <shortdesc lang="en">Full path to the parent containers "root" filesystems</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 <parameter name="LXC_CF_FILENAME" required="true" unique="false">
 <longdesc lang="en">The file holding the specific configuration for this container e.g. 'config'.</longdesc>
 <shortdesc lang="en">The LXC config file.</shortdesc>
 <content type="string" default=""/>
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"        timeout="10" />
 <action name="stop"         timeout="30" />
 <action name="monitor"      timeout="20" interval="60" start-delay="10" depth="0"/>
 <action name="reload"       timeout="20" />
 <action name="migrate_to"   timeout="30" />
 <action name="migrate_from" timeout="20" start-delay="20"/>
 <action name="validate-all" timeout="20" />
 <action name="meta-data"    timeout="5" />
 </actions>
 </resource-agent>
 END
 }
 
 
 LXC_usage() {
 	cat <<END
 	usage: $0 {start|stop|monitor|migrate_to|migrate_from|validate-all|meta-data}
 
 	Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 LXC_start() {
 	if LXC_validate ; then
 		if ! LXC_status ; then
 #			ocf_take_lock $LOCKFILE # does not work as I would expect ti too :-( #
 			if [ -f $LOCKFILE ] ; then
 				ocf_log err "Starting of" ${OCF_RESKEY_LXC_CNAME} "aborted as there is already a lock file!"
 				ocf_log info "If you are SURE that this resource is not running elswhere, just delete the file" $LOCKFILE
 				exit ${OCF_ERR_GENERIC}
 			else
 				touch $LOCKFILE
 	   			touch $trans_res_state
 				ocf_log info "Starting" ${OCF_RESKEY_LXC_CNAME} 
 				cd ${OCF_RESKEY_LXC_BCP}/${OCF_RESKEY_LXC_CNAME}/
 	        		ocf_run ${STARTCMD} || exit $OCF_ERR_GENERIC 
 			fi
 		else
 			# If already running, consider start successful
 			ocf_log debug ${OCF_RESOURCE_INSTANCE}: ${OCF_RESKEY_LXC_CNAME} "is already running"
 			return $OCF_SUCCESS
 		fi
 		return $OCF_SUCCESS
 	else
 		ret=$?
 		return $ret
 	fi
 }
 
 
 
 LXC_stop() {
 	# If the container is running "init" and is able to perform and orderly shutdown, then it should be done. 
 	typeset -i PID=0
 	lxc-ps -C init -opid |while read CN PID ;do
 		[[ $PID -gt 1 ]] || continue
 		[[ "$CN" = "${OCF_RESKEY_LXC_CNAME}" ]] || continue
 	grep -q 'p0::powerfail:/sbin/init 0' ${OCF_RESKEY_LXC_BRP}/${OCF_RESKEY_LXC_CNAME}/etc/inittab || continue
 	kill -PWR $PID
         if [ -n "$OCF_RESKEY_stop_timeout" ]
         then
                 # Allow 2/3 of the stop timeout for the orderly shutdown
                 # (The origin unit is ms, hence the conversion)
                 stop_timeout=$((OCF_RESKEY_stop_timeout/1500))
         elif [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
                 # Allow 2/3 of the action timeout for the orderly shutdown
                 # (The origin unit is ms, hence the conversion)
                 stop_timeout=$((OCF_RESKEY_CRM_meta_timeout/1500))
         else
                 stop_timeout=10
         fi
 	sleep $stop_timeout 
 	done
 	# If the container is still running, it will be stopped now. regardless of state!
 	lxc-stop -n ${OCF_RESKEY_LXC_CNAME}
 	if [ -f $LOCKFILE ]; then	
 		rm $LOCKFILE 
 	fi
 	if [ -f $trans_res_state ]; then	
 		rm $trans_res_state
 	else
 		ocf_log err "Dolt!" ${OCF_RESKEY_LXC_CNAME} "does not seem to be started!"
 		return ${OCF_ERR_GENERIC}
 	fi
 	return $OCF_SUCCESS
 }
 
-LXC_status() {
+LXC_monitor() {
         S=`lxc-info -n ${OCF_RESKEY_LXC_CNAME}`
 	ocf_log info "$S"
 	if [[ "${S##* }" = "RUNNING" ]] ; then 
 		if [ -f $trans_res_state ]; then
 			return $OCF_SUCCESS
 		else
 			return $OCF_ERR_GENERIC
 		fi
 	else
 		if [ -f $trans_res_state ]; then
 			ocf_log err "Dolt!" ${OCF_RESKEY_LXC_CNAME} "should be running!"
 			return $OCF_ERR_GENERIC
 		fi
 			return $OCF_NOT_RUNNING
 	fi
 }
 
-LXC_monitor() {
-	LXC_status
-	ret=$?
-	if [ $ret -eq $OCF_SUCCESS ]
-	then
-		if [ -n "${OCF_RESKEY_monitor_hook}" ]; then
-			eval "${OCF_RESKEY_monitor_hook}"
-                        if [ $? -ne $OCF_SUCCESS ]; then
-                                return $OCF_ERR_GENERIC
-                        fi
-			return $OCF_SUCCESS
-		else
-			true
-		fi
-	else
-		return $ret
-	fi
-}
 
 LXC_validate() {
 	# Quick check that all required attributes are set
 	if [ -z "${OCF_RESKEY_LXC_CNAME}" ]; then
 		ocf_log err "LXC container name not set!"
 		exit $OCF_ERR_CONFIGURED
 	fi
 	if [ -z "${OCF_RESKEY_LXC_BCP}" ]; then
 		ocf_log err "LXC configuration directory not set!"
 		exit $OCF_ERR_CONFIGURED
 	fi
 	if [ -z "${OCF_RESKEY_LXC_BRP}" ]; then
 		ocf_log err "LXC container root filesystem directory not set!"
 		exit $OCF_ERR_CONFIGURED
 	fi
 	if [ -z "${OCF_RESKEY_LXC_CF_FILENAME}" ]; then
 		ocf_log err "LXC configuration filename name not set!"
 		exit $OCF_ERR_CONFIGURED
 	fi
 	# Quick that CGROUPS are corrrectly mounted
  	if ! [ -f ${CGROUP_MOUNT_POINT}/notify_on_release ]; then
 		exit $OCF_ERR_INSTALLED
 	fi
 	# Quick check that required executables are present
  	check_binary lxc-start
  	check_binary lxc-stop
 	check_binary lxc-ps
 	check_binary lxc-info
 	check_binary screen
 	return $OCF_SUCCESS
 }
 
 case $__OCF_ACTION in
 meta-data)	meta_data
 		exit $OCF_SUCCESS
 		;;
 start)		LXC_start;;
 stop)		LXC_stop;;
 monitor)	LXC_monitor;;
 migrate_to)	ocf_log info "Moving ${OCF_RESOURCE_INSTANCE} to ${OCF_RESKEY_CRM_meta_migrate_to}."
 	        LXC_stop
 		;;
 migrate_from)	ocf_log info "Moving ${OCF_RESOURCE_INSTANCE} to ${OCF_RESKEY_CRM_meta_migrated_from}."
 	        LXC_start
 		;;
 reload)		ocf_log err "Reloading..."
 		LXC_stop	        
 		LXC_start
 		;;
 validate-all)	LXC_validate;;
 usage|help)	LXC_usage
 		exit $OCF_SUCCESS
 		;;
 *)		LXC_usage
 		ocf_log err "$0 was called with unsupported arguments: $*"
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 rc=$?
 ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
 exit $rc