Minor doc addition
Added --tool_macro_fields
Merged tool mode option add from dev