Minor bug fixes
Merge branch 'Voting' of https://github.com/RudigerRoach/301_main_emma into Voting
minor code improvements