Fixed problems pointed out by JP in the PR

Also added simple assistant model (no code modules and no model code, just relations)
Mostly to satisfy task_plan always needing an assistant.