Improved voting handling and some bugfixes...