more returning error instead of bool
forgot to add targetmanager, fixed now :)
Merge branch 'master' into commands_validate