add some more stuff

Change-Id: I6a76262df65479ee494ef8c91b1bd1d2405cf57a