add Windows support
more cleanup