Fixed Windows command and fixed some command-line option issues