Fixin up things and stuff