Corrected infinte recursion in htgt services plus minor changes