Merge pull request #2 from patrick-flor/master

The case of the missing parenthesis
some cleanup
more cleanup
added some helpful tracing
modified tracing a bit