More progress

fixed stuff.
Merge pull request #4 from Zarex/master

Stuff