renamed variables
some forgotten semicolons
Merge pull request #27 from piiiikachuuu/bug-fixing

minor revisions