Fixed current calculations so they might be a little more accurate.