Small fixes to text, layout