bug_fix: DetermShortRate

Various small fixes