fixing stuff and shit lol