fix shit and stuff