More fixes.
More fixes 2.
Small fixes 3.
Small fixes 4.
Merge pull request #11 from Piter432/patch-5

More fixes.