more good stuff

Change-Id: I3114a7dc6721e954c0e7fea9dfeae007fb19feb5