Adapted message file. bug fixes.