Tweaked figures and calculations a bit.