Tightening the rendering… Still have a lot of work to do...