Remove --target option
Merge unmarshal functions
graph command
highlighting via target