diff --git a/w2v-server.pl b/w2v-server.pl
index 38dc8e8..fec8796 100755
--- a/w2v-server.pl
+++ b/w2v-server.pl
@@ -218,7 +218,7 @@
   my $c    = shift;
   $c->app->log->info("get: ".$c->req->url->to_abs);
 	my $word=$c->param('word');
-  my $no_nbs=$c->param('n') || 100;
+  my $no_nbs=$c->param('n') || ($opt_m? 50 : 100);
   my $no_iterations=$c->param('N') || 2000;
   my $perplexity=$c->param('perplexity') || 20;
   my $epsilon=$c->param('epsilon') || 5;
@@ -857,7 +857,7 @@
 
   for (a = 0; a < N; a++) best[a].activation = worstbest;
 
-  for (c = 0; c < 10000; c++) {
+  for (c = 0; c < 500000; c++) {
     if(garbage && garbage[c]) continue;
     a = 0;
     dist = 0;