add comments, fixed '' bug

Change-Id: Idaed41dfe29213903d4211ccd55efa0c1df57ef5