getNextEntity added, setFaction added, some changes to the way info is stored in the vectors