a lot of fixes.
Merge pull request #148 from VBlizzard/patch-52

a lot of fixes.