multiple [critical] bug fixes