made comments and voting sign in exclusive
merge conflict fixed
minor changes