diff --git a/tools/crm_failcount b/tools/crm_failcount
index 872a1f19b2..19cd941c61 100755
--- a/tools/crm_failcount
+++ b/tools/crm_failcount
@@ -1,118 +1,118 @@
 #!/bin/bash
 
 USAGE_TEXT="Usage: crm_failcount <command> [<options>]
 Common options:
  --help                 Display this text, then exit
  --version              Display version information, then exit
  -V, --verbose          Specify multiple times to increase debug output
  -q, --quiet            Print only the value (if querying)
 
 Commands:
  -G, --query            Query the current value of the resource's fail count
  -D, --delete           Delete resource's recorded failures
 
 Additional Options:
  -r, --resource=value   Name of the resource to use (required)
- -N, --node=value       Set an attribute for the named node (instead of the current one)"
+ -N, --node=value       Use failcount on named node (instead of local node)"
 
 
 HELP_TEXT="crm_failcount - Query or delete resource fail counts
 
 crm_failcount is a convenience wrapper for crm_attribute (if querying)
 and crm_resource --cleanup (if deleting).
 
 $USAGE_TEXT"
 
 
 exit_usage() {
 	if [ $# -gt 0 ]; then
 		echo "error: $@" >&2
 	fi
 	echo
 	echo "$USAGE_TEXT"
 	exit 1
 }
 
 warn() {
 	echo "warning: $@" >&2
 }
 
 command=""
 options=""
 resource=""
 target=$(crm_node -n 2>/dev/null)
 
 LONGOPTS_COMMON="help,version,verbose,quiet"
 LONGOPTS_COMMANDS="query,delete"
 LONGOPTS_OTHER="resource:,node:"
 LONGOPTS_COMPAT="delete-attr,get-value,resource-id:,uname:,lifetime:,attr-value:,attr-id:"
 
 LONGOPTS="$LONGOPTS_COMMON,$LONGOPTS_COMMANDS,$LONGOPTS_OTHER,$LONGOPTS_COMPAT"
 
 TEMP=$(getopt -o qDGQVN:U:v:i:l:r: --long $LONGOPTS -n crm_failcount -- "$@")
 if [ $? != 0 ]; then
 	exit_usage
 fi
 eval set -- "$TEMP" # Quotes around $TEMP are essential
 
 while true ; do
 	case "$1" in
 		--help)
 			echo "$HELP_TEXT"
 			exit 0
 			;;
 		--version)
 			crm_attribute --version
 			exit $?
 			;;
-		-Q|--quiet|-V|--verbose)
+		-q|-Q|--quiet|-V|--verbose)
 			options="$options $1"
 			shift
 			;;
 		-G|--query|--get-value)
 			command="--query"
 			shift
 			;;
 		-D|--delete|--delete-attr)
 			command="--delete"
 			shift
 			;;
 		-r|--resource|--resource-id)
 			resource="$2"
 			shift 2
 			;;
 		-N|--node|-U|--uname)
 			target="$2"
 			shift 2
 			;;
 		-v|--attr-value)
 			if [ "$2" = "0" ]; then
 				command="--delete"
 			else
 				warn "ignoring deprecated option '$1' with nonzero value"
 			fi
 			shift 2
 			;;
 		-i|--attr-id|-l|--lifetime)
 			warn "ignoring deprecated option '$1'"
 			shift 2
 			;;
 		--)
 			shift
 			break
 			;;
 		*)
 			exit_usage "unknown option '$1'"
 			;;
 	esac
 done
 
 [ -n "$command" ]  || exit_usage "must specify a command"
 [ -n "$resource" ] || exit_usage "resource name required"
 [ -n "$target" ]   || exit_usage "node name required"
 
 if [ "$command" = "--query" ]; then
 	crm_attribute $options $command -N "$target" -n "fail-count-$resource" -t status -d 0
 else
 	crm_resource --cleanup $options -N "$target" -r "$resource"
 fi