fix the things and stuff