Pushed latest changes which needs more consolidation

Signed-off-by: Jochen Hiller <jo.hiller@googlemail.com>