Really really hopefully fixed everything