fixed and added some stuff