Fixes the way heat_capacity is handled.
Adds COLLECTION_FACTOR for future tweaking