Change vectors to sets, add threatened and some more stuff