Some more progress on the main Paxos implementation. Plus some clean up