Bug fixes and font change