fixing some format issues in Windows...