Additions of some lost code, and cleanup.
Enyo-DCO-1.1-Signed-off-by: Blake Stephens <blake.stephens@lge.com>