More tracing, update to fixed platform.
Merge branch 'master' of github.com:HeliumProject/Helium