General bug-fixes #2.
Further progress with BA.