fix some windows issues
added note for windows users
fix conflict