add command handlers for user arguments with different number of tokens, better termination logic on timeout