move leader, add filename commands, use leader instead of ','