1294 extend hets api

some cleaning up and fix of #1294