added some shit and renamed other shit