Fix and add command lines for windows