fix numbers and stuff