fixing timing
fixing commands
adding scenarios
updating client