renderer cleanups
increased coverage