FIX: some text changes