Better performance, still at least a good few minutes to save from generic errors and better movement.

Happy as this is my 2nd run overall.