added and changes some stuff