Usability and style tweaks.