correcting some issues noticed in windowss