!htp upgrade (and simplify) main API entrypoints