Files fixed, Windows support added