more improvements to the renderer and styles, fixed tests.