Hopefully fixed it all.