add some stuff missed in the previous commit