diff --git a/src/raft.c b/src/raft.c
index c7abd8f..a98f4ad 100644
--- a/src/raft.c
+++ b/src/raft.c
@@ -1,773 +1,772 @@
 /*
  * Copyright (C) 2014 Philipp Marek <philipp.marek@linbit.com>
  *
  * 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.1 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
 #include <errno.h>
 #include <arpa/inet.h>
 #include "booth.h"
 #include "transport.h"
 #include "inline-fn.h"
 #include "config.h"
 #include "raft.h"
 #include "ticket.h"
 #include "log.h"
 
 
 
 inline static void clear_election(struct ticket_config *tk)
 {
 	int i;
 	struct booth_site *site;
 
 	log_debug("clear election");
 	tk->votes_received = 0;
 	foreach_node(i, site)
 		tk->votes_for[site->index] = NULL;
 }
 
 
 inline static void record_vote(struct ticket_config *tk,
 		struct booth_site *who,
 		struct booth_site *vote)
 {
 	log_info("site \"%s\" votes for \"%s\"",
 			site_string(who),
 			site_string(vote));
 
 	if (!tk->votes_for[who->index]) {
 		tk->votes_for[who->index] = vote;
 		tk->votes_received |= who->bitmask;
 	} else {
 		if (tk->votes_for[who->index] != vote)
 			log_error("voted previously (but in same term!) for \"%s\"...",
 					tk->votes_for[who->index]->addr_string);
 	}
 }
 
 
 static int cmp_msg_ticket(struct ticket_config *tk,
 		struct boothc_ticket_msg *msg)
 {
 	if (tk->current_term != ntohl(msg->ticket.term)) {
 		return tk->current_term - ntohl(msg->ticket.term);
 	}
 	return tk->commit_index - ntohl(msg->ticket.leader_commit);
 }
 
 static void update_term_from_msg(struct ticket_config *tk,
 		struct boothc_ticket_msg *msg)
 {
 	uint32_t i;
 
 
 	i = ntohl(msg->ticket.term);
 	/* if we failed to start the election, then accept the term
 	 * from the leader
 	 * */
 	if (tk->state == ST_CANDIDATE) {
 		tk->current_term = i;
 	} else {
 		tk->current_term = max(i, tk->current_term);
 	}
 
 	/* § 5.3 */
 	i = ntohl(msg->ticket.leader_commit);
 	tk->commit_index = max(i, tk->commit_index);
 }
 
 
 static void update_ticket_from_msg(struct ticket_config *tk,
 		struct boothc_ticket_msg *msg)
 {
 	int duration;
 
 
 	duration = tk->term_duration;
 	if (msg)
 		duration = min(duration, ntohl(msg->ticket.term_valid_for));
 	tk->term_expires = time(NULL) + duration;
 
 
 	if (msg) {
 		update_term_from_msg(tk, msg);
 	}
 }
 
 static void become_follower(struct ticket_config *tk,
 		struct boothc_ticket_msg *msg)
 {
 	update_ticket_from_msg(tk, msg);
 	tk->state = ST_FOLLOWER;
 }
 
 
 struct booth_site *majority_votes(struct ticket_config *tk)
 {
 	int i, n;
 	struct booth_site *v;
 	int count[MAX_NODES] = { 0, };
 
 
 	for(i=0; i<booth_conf->site_count; i++) {
 		v = tk->votes_for[i];
 		if (!v)
 			continue;
 
 		n = v->index;
 		count[n]++;
 		log_info("Majority: %d \"%s\" wants %d \"%s\" => %d",
 				i, booth_conf->site[i].addr_string,
 				n, v->addr_string,
 				count[n]);
 
 		if (count[n]*2 <= booth_conf->site_count)
 			continue;
 
 
 		log_info("Majority reached: %d of %d for \"%s\"",
 				count[n], booth_conf->site_count,
 				v->addr_string);
 		return v;
 	}
 
 	return NULL;
 }
 
 
 static int all_voted(struct ticket_config *tk)
 {
 	int i, cnt = 0;
 
 	for(i=0; i<booth_conf->site_count; i++) {
 		if (tk->votes_for[i]) {
 			cnt++;
 		}
 	}
 
 	return (cnt == booth_conf->site_count);
 }
 
 
 static int newer_term(struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg,
 		int in_election)
 {
 	uint32_t term;
 
 	term = ntohl(msg->ticket.term);
 	/* §5.1 */
 	if (term > tk->current_term) {
 		tk->state = ST_FOLLOWER;
 		if (!in_election) {
 			tk->leader = leader;
 			log_debug("from %s: higher term %d vs. %d, following \"%s\"",
 					sender->addr_string,
 					term, tk->current_term,
 					ticket_leader_string(tk));
 		} else {
 			tk->leader = no_leader;
 			log_debug("from %s: higher term %d vs. %d (election)",
 					sender->addr_string,
 					term, tk->current_term);
 		}
 
 		tk->term_expires = time(NULL) + tk->term_duration;
 		tk->current_term = term;
 		return 1;
 	}
 
 	return 0;
 }
 
 static int term_too_low(struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg)
 {
 	uint32_t term;
 
 	term = ntohl(msg->ticket.term);
 	/* §5.1 */
 	if (term < tk->current_term)
 	{
 		log_info("sending REJECT, term too low.");
 		send_reject(sender, tk, RLT_TERM_OUTDATED);
 		return 1;
 	}
 
 	return 0;
 }
 
 
 
 
 /* For follower. */
 static int answer_HEARTBEAT (
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	uint32_t term;
 	struct boothc_ticket_msg omsg;
 
 
 	term = ntohl(msg->ticket.term);
 	log_debug("leader: %s, have %s; term %d vs %d",
 			site_string(leader), ticket_leader_string(tk),
 			term, tk->current_term);
 
-	/* No reject. (?) */
-	if (term < tk->current_term) {
+	if (tk->state != ST_CANDIDATE && term < tk->current_term) {
 		log_info("ignoring lower term %d vs. %d, from \"%s\"",
 				term, tk->current_term,
 				ticket_leader_string(tk));
 		return 0;
 	}
 
 	/* Needed? */
 	newer_term(tk, sender, leader, msg, 0);
 
 	become_follower(tk, msg);
 	/* Racy??? */
 	assert(sender == leader || !leader);
 
 	tk->leader = leader;
 
 	/* Ack the heartbeat (we comply). */
 	init_ticket_msg(&omsg, OP_HEARTBEAT, RLT_SUCCESS, tk);
 	return booth_udp_send(sender, &omsg, sizeof(omsg));
 }
 
 
 static int process_UPDATE (
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	uint32_t term;
 
 
 	term = ntohl(msg->ticket.term);
 	log_debug("leader: %s, have %s; term %d vs %d",
 			site_string(leader), ticket_leader_string(tk),
 			term, tk->current_term);
 
 	/* No reject. (?) */
 	if (term < tk->current_term) {
 		log_warn("ignoring lower term %d vs. %d, from \"%s\"",
 				term, tk->current_term,
 				ticket_leader_string(tk));
 		return 0;
 	}
 
 	update_ticket_from_msg(tk, msg);
 	ticket_write(tk);
 
 	/* run ticket_cron if the ticket expires */
 	set_ticket_wakeup(tk);
 
 	return 0;
 }
 
 static int process_REVOKE (
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	if (tk->leader != sender) {
 		log_error("from %s: non-leader wants to revoke ticket %s (ignoring)",
 			sender->addr_string, tk->name);
 		return 1;
 	} else if (tk->state != ST_FOLLOWER) {
 		log_error("from %s: unexpected ticket %s revoke in state %s (ignoring)",
 			sender->addr_string,
 			state_to_string(tk->state),
 			tk->name);
 		return 1;
 	} else {
 		log_info("from %s: leader revokes ticket %s",
 			sender->addr_string, tk->name);
 		reset_ticket(tk);
 		ticket_write(tk);
 	}
 
 	return 0;
 }
 
 /* update the ticket on the leader, write it to the CIB, and
    send out the update message to others with the new expiry
    time
 */
 static int leader_update_ticket(struct ticket_config *tk)
 {
 	struct boothc_ticket_msg msg;
 
 	tk->term_expires = time(NULL) + tk->term_duration;
 	tk->retry_number = 0;
 	ticket_write(tk);
 	set_ticket_wakeup(tk);
 	init_ticket_msg(&msg, OP_UPDATE, RLT_SUCCESS, tk);
 	return transport()->broadcast(&msg, sizeof(msg));
 }
 
 /* For leader. */
 static int process_HEARTBEAT(
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	uint32_t term;
 
 
 	if (newer_term(tk, sender, leader, msg, 0)) {
 		/* Uh oh. Higher term?? Should we simply believe that? */
 		log_error("Got higher term number from");
 		return 0;
 	}
 
 
 	term = ntohl(msg->ticket.term);
 
 	/* Don't send a reject. */
 	if (term < tk->current_term) {
 		/* Doesn't know what he's talking about - perhaps
 		 * doesn't receive our packets? */
 		log_error("Stale/wrong heartbeat from \"%s\": "
 				"term %d instead of %d",
 				site_string(sender),
 				term, tk->current_term);
 		return 0;
 	}
 
 
 	if (term == tk->current_term &&
 			leader == tk->leader) {
 		/* Hooray, an ACK! */
 		/* So at least _someone_ is listening. */
 		tk->hb_received |= sender->bitmask;
 
 		log_debug("Got heartbeat ACK from \"%s\", %d/%d agree.",
 				site_string(sender),
 				count_bits(tk->hb_received),
 				booth_conf->site_count);
 
 
 		if (majority_of_bits(tk, tk->hb_received)) {
 			/* OK, at least half of the nodes are reachable;
 			 * Update the ticket and send update messages out
 			 */
 			if( !tk->majority_acks_received ) {
 			/* Write the ticket to the CIB and set the next
 			 * wakeup time (but do that only once) */
 				tk->majority_acks_received = 1;
 				return leader_update_ticket(tk);
 			}
 		}
 	}
 
 	return 0;
 }
 
 
 void leader_elected(
 		struct ticket_config *tk,
 		struct booth_site *new_leader
 		)
 {
 	if (new_leader) {
 		tk->leader = new_leader;
 
 		tk->term_expires = time(NULL) + tk->term_duration;
 		tk->election_end = 0;
 		tk->voted_for = NULL;
 
 		if (new_leader == local)  {
 			tk->commit_index++;
 			tk->state = ST_LEADER;
 			send_heartbeat(tk);
 		} else
 			become_follower(tk, NULL);
 	}
 }
 
 
 static int process_VOTE_FOR(
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 		)
 {
 	if (term_too_low(tk, sender, leader, msg))
 		return 0;
 
 	if (newer_term(tk, sender, leader, msg, 0)) {
 		clear_election(tk);
 	}
 
 
 	record_vote(tk, sender, leader);
 
 
 	if (tk->state != ST_CANDIDATE) {
 		/* lost candidate status, somebody rejected our proposal */
 		return 0;
 	}
 
 
 	/* only if all voted can we take the ticket now, otherwise
 	 * wait for timeout in ticket_cron */
 	if (all_voted(tk)) {
 		/* §5.2 */
 		leader_elected(tk, majority_votes(tk));
 		set_ticket_wakeup(tk);
 	}
 
 	return 0;
 }
 
 
 static int process_REJECTED(
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 		)
 {
 	uint32_t rv;
 
 	rv   = ntohl(msg->header.result);
 
 	if (tk->state == ST_CANDIDATE &&
 			rv == RLT_TERM_OUTDATED) {
 		log_warn("from %s: ticket %s outdated (term %d), following %s",
 				site_string(sender),
 				tk->name, ntohl(msg->ticket.term),
 				site_string(leader)
 				);
 		tk->leader = leader;
 		become_follower(tk, msg);
 		return 0;
 	}
 
 
 	if (tk->state == ST_CANDIDATE &&
 			rv == RLT_TERM_STILL_VALID) {
 		log_warn("from %s: there's a leader that I don't see: \"%s\"",
 				site_string(sender),
 				site_string(leader));
 		tk->leader = leader;
 		become_follower(tk, msg);
 		return 0;
 	}
 
 	log_warn("from %s: in state %s, got %s (unexpected reject)",
 			site_string(sender),
 			state_to_string(tk->state),
 			state_to_string(rv));
 	tk->leader = leader;
 	become_follower(tk, msg);
 	return 0;
 }
 
 
 static int send_ticket (
 		int cmd,
 		struct ticket_config *tk,
 		struct booth_site *to_site
 	       )
 {
 	struct boothc_ticket_msg omsg;
 
 
 	init_ticket_msg(&omsg, cmd, RLT_SUCCESS, tk);
 	return booth_udp_send(to_site, &omsg, sizeof(omsg));
 }
 
 
 /* §5.2 */
 static int answer_REQ_VOTE(
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 		)
 {
 	uint32_t term;
 	int valid;
 	struct boothc_ticket_msg omsg;
 
 
 	term = ntohl(msg->ticket.term);
 	/* Important: Ignore duplicated packets! */
 	valid = term_time_left(tk);
 	if (valid &&
 			term == tk->current_term &&
 			sender == tk->leader) {
 		log_debug("Duplicate OP_VOTE_FOR ignored.");
 		return 0;
 	}
 
 	if (valid) {
 		log_info("no election allowed, term valid for %d??", valid);
 		return send_reject(sender, tk, RLT_TERM_STILL_VALID);
 	}
 
 	if (term_too_low(tk, sender, leader, msg))
 		return 0;
 
 	if (newer_term(tk, sender, leader, msg, 1)) {
 		clear_election(tk);
 		goto vote_for_sender;
 	}
 
 
 	/* §5.2, §5.4 */
 	if (!tk->voted_for) {
 vote_for_sender:
 		tk->voted_for = sender;
 		record_vote(tk, sender, leader);
 		goto yes_you_can;
 	}
 
 
 yes_you_can:
 	init_ticket_msg(&omsg, OP_VOTE_FOR, RLT_SUCCESS, tk);
 	omsg.ticket.leader = htonl(get_node_id(tk->voted_for));
 	return booth_udp_send(sender, &omsg, sizeof(omsg));
 }
 
 
 int new_election(struct ticket_config *tk,
 	struct booth_site *preference, int update_term)
 {
 	struct booth_site *new_leader;
 	time_t now;
 
 
 	time(&now);
 	log_debug("start new election?, now=%" PRIi64 ", end %" PRIi64,
 			(int64_t)now, (int64_t)(tk->election_end));
 	if (now <= tk->election_end)
 		return 0;
 
 
 	/* §5.2 */
 	/* If there was _no_ answer, don't keep incrementing the term number
 	 * indefinitely. If there was no peer, there'll probably be no one
 	 * listening now either. However, we don't know if we were
 	 * invoked due to a timeout (caller does).
 	 */
 	if (update_term)
 		tk->current_term++;
 
 	tk->term_expires = 0;
 	tk->election_end = now + tk->term_duration;
 
 	log_debug("start new election! term=%d, until %" PRIi64,
 			tk->current_term, (int64_t)tk->election_end);
 	clear_election(tk);
 
 	if(preference)
 		new_leader = preference;
 	else
 		new_leader = (local->type == SITE) ? local : NULL;
 	record_vote(tk, local, new_leader);
 	tk->voted_for = new_leader;
 
 	tk->state = ST_CANDIDATE;
 
 	ticket_broadcast(tk, OP_REQ_VOTE, RLT_SUCCESS);
 	ticket_activate_timeout(tk);
 	return 0;
 }
 
 
 /* we were a leader and somebody says that they have a more up
  * to date ticket
  * there was probably connectivity loss
  * tricky
  */
 static int leader_handle_newer_ticket(
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	if (leader == no_leader || !leader || leader == local) {
 		/* at least nobody else owns the ticket */
 		/* it is not kosher to update from their copy, but since
 		 * they don't own the ticket, nothing bad can happen
 		 */
 		update_term_from_msg(tk, msg);
 		/* get the ticket again, if we can
 		 */
 		return acquire_ticket(tk);
 	}
 
 	/* eek, two leaders, split brain */
 	/* normally shouldn't happen; run election */
 	log_error("from %s: ticket %s at %s! (disowning ticket)",
 			site_string(sender),
 			tk->name, site_string(leader)
 			);
 	disown_ticket(tk);
 	ticket_write(tk);
 	log_error("Two ticket owners! Possible bug. Please report at https://github.com/ClusterLabs/booth/issues/new.");
 	return acquire_ticket(tk);
 }
 
 /* reply to STATUS */
 static int process_MY_INDEX (
 		struct ticket_config *tk,
 		struct booth_site *sender,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	int i;
 
 	if (!msg->ticket.term_valid_for) {
 		/* ticket not valid */
 		return 0;
 	}
 
 	i = cmp_msg_ticket(tk, msg);
 
 	if (i > 0) {
 		/* let them know about our newer ticket */
 		send_ticket(OP_MY_INDEX, tk, sender);
 		if (tk->state == ST_LEADER)
 			return send_ticket(OP_UPDATE, tk, sender);
 	}
 
 	if (i == 0) {
 		return 0;
 	}
 
 	/* they have a newer ticket, trouble if we're already leader
 	 * for it */
 	if (tk->state == ST_LEADER) {
 		log_warn("from %s: more uptodate ticket %s at %s",
 				site_string(sender),
 				tk->name,
 				site_string(leader)
 				);
 		return leader_handle_newer_ticket(tk, sender, leader, msg);
 	}
 
 	update_ticket_from_msg(tk, msg);
 	if (leader == local) {
 		/* if we were the leader but we rebooted in the
 		 * meantime; try to get the ticket again
 		 */
 		return acquire_ticket(tk);
 	} else {
 		tk->leader = leader;
 		tk->state = (!leader || leader == no_leader) ?
 			ST_INIT : ST_FOLLOWER;
 	}
 	return 0;
 }
 
 
 int raft_answer(
 		struct ticket_config *tk,
 		struct booth_site *from,
 		struct booth_site *leader,
 		struct boothc_ticket_msg *msg
 	       )
 {
 	int cmd;
 	int rv;
 
 	rv = 0;
 	cmd = ntohl(msg->header.cmd);
 	R(tk);
 
 	log_debug("got message %s from \"%s\"",
 			state_to_string(cmd),
 			from->addr_string);
 
 
 	switch (cmd) {
 	case OP_REQ_VOTE:
 		rv = answer_REQ_VOTE(tk, from, leader, msg);
 		break;
 	case OP_VOTE_FOR:
 		rv = process_VOTE_FOR(tk, from, leader, msg);
 		break;
 	case OP_HEARTBEAT:
 		if (tk->leader == local &&
 				tk->state == ST_LEADER)
 			rv = process_HEARTBEAT(tk, from, leader, msg);
 		else if (tk->leader != local &&
 				(tk->state == ST_FOLLOWER ||
 				tk->state == ST_CANDIDATE))
 			rv = answer_HEARTBEAT(tk, from, leader, msg);
 		else {
 			log_error("unexpected message, cmd %s, from %s",
 				state_to_string(cmd),
 				from->addr_string);
 			rv = -EINVAL;
 		}
 		break;
 	case OP_UPDATE:
 		if (tk->leader != local && tk->state == ST_FOLLOWER) {
 			rv = process_UPDATE(tk, from, leader, msg);
 		} else {
 			log_error("unexpected message, cmd %s, from %s",
 				state_to_string(cmd),
 				from->addr_string);
 			rv = -EINVAL;
 		}
 		break;
 	case OP_REJECTED:
 		rv = process_REJECTED(tk, from, leader, msg);
 		break;
 	case OP_REVOKE:
 		rv = process_REVOKE(tk, from, leader, msg);
 		break;
 	case OP_MY_INDEX:
 		rv = process_MY_INDEX(tk, from, leader, msg);
 		break;
 	case OP_STATUS:
 		rv = send_ticket(OP_MY_INDEX, tk, from);
 		break;
 	default:
 		log_error("unprocessed message, cmd %s, from %s",
 			state_to_string(cmd),
 			from->addr_string);
 		rv = -EINVAL;
 	}
 	R(tk);
 	return rv;
 }