reorganize some methods
merge add_fw and add_wf commands