I Fought the Lawn: Minor update - More performance tweaks

Further work on improving overall performance.