Fixed problems pointed out by JP in the PR
More spec fixes and added missing relations
Merge pull request #21 from Dantemss/assistant_fixes

Fixed problems pointed out by JP in the PR