add a few and remove one from note3

Change-Id: I228f1c87a6ff22f82148d69d377c1d9ff90fa63b