Hopefully fixed them all