Pretty sure i fixed everything that needed a fix!