fixed things and stuff