Added additional debugging information and short-circuit optimizations

Merged Nigel Kukard requested to merge optimizations into master

Merge request reports