Fixed configuration name
Fixed parameter names
Changed enabling node
Fixed tests
Merge pull request #172 from WouterJ/fix_things

Fixed some small standards things