Draw comments and replace 'fill', 'clear' with 'draw'