Trim samples
Add more samples:

This is pretty much it now for v2.0 w.r.t. new samples