touch up to sources: voting and headers
voting patch 2 migration