Added Entities and tweaked rendering.