add filled rect & ellipse
final version