Build 13: slightly improved renderer code