Reduce time limits and tighten the model a bit