Reduced parameters for movesender and made waiting more efficient for
server.