more settings & wiring

Change-Id: I86c41842a0a3d794b2382062c9c40571bf1a8899