fixed shit and added some stuff