add settings
with set on boot delay option
minor clean up

Change-Id: I1e3bfbd490f94eba862ead9863a64d2bb38cc45b