back in working order for the type: checks, still not quite on the function ones