Fixed bugs and stripped it down.

Stripped out parameters list for ease of implementation and fixed report
variable bugs.