Some more irritating little niggles fixed.