more TODO, about encryption and peer storage

Change-Id: I0c19a6022f725b4a0fdfbdca01b499eb5238c1f8