Small improvements

Change the way it decides on what entities to draw