fixing stuff, brb