I was aware about some of it but thanks for pointing it out in any case. There is more spaghetti that shouldn't be there in the demo so I'll try and fix it this evening and upload a new build.
