Revert "Revert infinite loop implemented a commit ago..."

This reverts commit eb7ea10fbd3cecba39484ddd7e50ad736d918d7b.
Proper fix
Bunch of improvements
Updated sources
BBS RC8
bugfixes