Enter exit fix

This fix changes the way objects are added and modified so that they follow the proper d3 flow.