A few improvements
Rendering improvements