catch-up mode
add a switch for catcup mode
fix catch-up
add more commands