fixed more bugs
Merge pull request #7 from mindBeef/master

fixed more bugs