More progress on rendering and data structures