Tweaks moved in from local project.

Attempting to improve performance. Any subsequent modifications will result in significant gains.