Fix volume calculation
Fix up units
Update to latest fulldb