merge some google grafika improvements