make less retry
fix minor bugs