fixed everything i think