Fixes - now with more "actually works"!