changed a few things and added some stuff