It came to me in a dream - literally. This should fix all known issues.