Finickity threading issue resolved
Tidy up
More tidy up around animation loop