Windows support

Cleaned up