more stuff
Merge pull request #4 from qbranch-code/morefixes

more stuff