Improved on the freezing bug

Now goes a lot longer without stalling. Not sure if its completely fixed
yet.