Cinnamon improvements.