Fixed NaN counts when making monitor bins. Added clause to catch this in cache.
Merge parallel changes