edit vote and clean up event a bit for #103