fix Draw.Fill and add filled geometry