fixed windows for real this time, started work on others