Fixed some major time losses. Smaller amounts of time to save spread out between lots of splits.