add more missing stuff, removed other stuff