and a random mess of wrapper corrections