fix spacing, id/name counterpart checking
Merge branch 'master' of https://github.com/digitalabs/Fieldbook