Hopefully fixed it all