Bug fixes.  Start improvements on language file.