various improvements for mafia