Minor changes. TODO NEXT:

DIVIDE EVOLVE IN SEVERAL METHODS/ FINISH ITS TESTING