Some election fixes
Some time edits