Add a few changes

+ SoC in the correct place to log data.
Merge branch 'beta'