fixing more types and trying to support breaking during runtime