add more missing stuff