collision and bonus-system bugs fixed