More fixes for endless Loading Bug

After the last update I was contacted by a person who still had the endless loading bug problem. Because of the changes I was able to reproduce this issue more easiliy and I was able to fix it. I am fairly certain I have fund all the bugs now, but you never know. If you still encounter the issue please let me know.