minor fixes
Some small modifications for rounding consistency
Added code for additional graph content