Rewrite hirk commands
Better log messages