Minor changes, including sorting out fonts