Another Threesome + Small Fixes