fixed not passing tests (renderers) + small improvements. refs #HOT-42