removed any possibility of variable name clashes and added commented entries i used for debugging, fixes #49