m4: clean up and add additional props

Change-Id: I0259251ec02dec66634dc07ccad625f30410563c