fixing stuff and stuff