more fixes on rendering