Hopefully fixed everything