S000: Minor tweaking

Change-Id: Ieb754ae0d173c235c2b2737ca55a16add7d1a8f9
S000: Working on adit

Change-Id: If396fbc2947fe3adbdfddea0ffe7a523d1a01719
Merge pull request #13 from autowitch/dev

Dev