Add some of the missing assignments
Merge pull request #128 from olemstrom/master

Add some of the missing assignments etc