Lots of bug fixing and scrubbing in prog …

Lots of bug fixing and scrubbing in progress. Taming the wild bug tracker.