Fixed problems pointed out by JP in the PR
More spec fixes and added missing relations
Assistants WIP
Added manual assistant