Vote upd. Minor improvements