Prevent extras from spawning on bridges.

Closes #557.
Fixed another warning
Merge some bugfixes.