Syntax and radix
Merge branch 'master' into develop
Fix some gotchas