fixed patch-commands
finetuning, task1 working (mostly)
merge