bunch of changes
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Ib374e45b729b398a7cb93bdb16e676542c2607f9