Edit basic concepts a little

Change-Id: I944967e5b492cd99629ae9c3a9ea48c55504f5ce
Merge "Edit basic concepts a little"