fixes here and there and everywhere.
Merge pull request #12 from VBlizzard/patch-73

fixes here and there and everywhere.