Fix total return calculations
Cached values
Added gems for session and others