stuff and things

Change-Id: I68bde3ab67b5de036abb523079d29cf1baaa8a5e