Eden/controller improvements

Marking the elements is better because because is O(1) instead of O(n) also there is less chance of memory leaking.