fixing things and stuff