Next version lots of small improvements

Change-Id: I999284469710579723a927ac41b2fa14d23665a8