Add various todos accross the component.

These todos have come from
 - reviewing code (including escaping)
 - testing various methods
 - reviewing test coverage

Change-Id: I3520372b8d958a60120a00d0ce4c7012dbb8f8cb
Merge "Add various todos accross the component."