various improvements for mafia
Merge pull request #919 from MJB47/mafia

various improvements for mafia