Are you sure you tested the code from my branch and nothing else? Because you made some changes in the meantime that look extremely different and make the whole thing unstable.