As there have been a few bugs reported since reuploading the demo, I present to you a patch to resolve these issues. Inform me if there are still any bugs I must've missed. Cheers.

Download it here.