WIP - last touches and cleaning up

Change-Id: Ie8de12f64d8c752f4459b47a50276502ad1b674b