Working on updating the calculations

Based off suggestions: https://github.com/WhisperSystems/TextSecure/issues/184