switch to directly calculated growth rate and extend model options, take 2

switch to directly calculated growth rate and extend model options, take 2 #1331