fixed cmd parsing and dates on windows
merge