Updates For Windows; Better Unicode Support