fixes, updates and cleaning

Change-Id: Ie34ec8fceccd0ac9c98adabe6be5dd9678b01949