made it easier to disable typechecking
merge fix