added some stuff, fixed some stuff