Think ive fixed everything...