fixed things and added some stuff