B40 -- a bunch of improvements..