Rendering fancyness + a small fix