Minor spell and layout updates