Covered numerous technical debt issues.

Change-Id: I11122aec3b8ed9905924e2b1fc847badcf20d566