Bugfixes to after testing.

Fixes #10 as we now have 3 transponders.