Few slight changes in text and GUI behavior