SSP-650 Fixed Issue
Resolved a number of other issues that cropped up with new dataset.
Should be good to go.