A performance fix for @-AlgebraX- Look at comments in the project for explanations on the changes I made. Some of the comments I made disappeared ;(
