reupdate of all the correcitons, let me know if I missed one