Ondemand: Few minor updates

Few refactoring plus brought back some HTC stuff back in.

Signed-off-by: zeroblade1984 <zeroblade1984@gmail.com>