logic moved, bugfixes
Add mafia trigger set (empty right now)
Fix some logic