fixed some code and errors
Merge pull request #67 from nixolas1/mobiletweak

fixed some code and errors