added some stuff i missed out