For the first point, I will wait for #20 

I don't understand the second point.