election office/race and phone fixes; refactoring