Bug fixed.
Fixed some of the windows related problems.