Bug fixes. This module is still a bit unshaky so apologies if testing it doesn't work easily.
Development version, subject to change.
