bring up steelhead and fix a few things

Change-Id: I655abe7f0070a39264fd9381290f2dfc56043096