Fix up, add, & change a few things

Change-Id: I030407239d0879a6093144b134c1344ea0f61858