fixes jade bugs as well as returning the internal APi