some additional props / changes

Change-Id: I003bac4e490e70ee638d9e50e4b668e3437d7e82