diff --git a/group.cpp b/group.cpp
index e46de82..a9dcfd1 100644
--- a/group.cpp
+++ b/group.cpp
@@ -378,7 +378,7 @@ void Group::Generate(IdList<Entity,hEntity> *entity,
             AddParam(param, h.param(1), gc.y);
             AddParam(param, h.param(2), gc.z);
             // The rotation quaternion
-            AddParam(param, h.param(3), 15*PI/180);
+            AddParam(param, h.param(3), 30*PI/180);
             AddParam(param, h.param(4), gn.x);
             AddParam(param, h.param(5), gn.y);
             AddParam(param, h.param(6), gn.z);
diff --git a/textscreens.cpp b/textscreens.cpp
index 7e9fb6d..e7318da 100644
--- a/textscreens.cpp
+++ b/textscreens.cpp
@@ -629,8 +629,29 @@ void TextWindow::EditControlDone(char *s) {
             if(e) {
                 SS.UndoRemember();
 
+                double ev = e->Eval();
+                if((int)ev < 1) {
+                    Error("Can't repeat fewer than 1 time.");
+                    break;
+                }
+
                 Group *g = SS.GetGroup(edit.group);
-                g->valA = e->Eval();
+                g->valA = ev;
+
+                if(g->type == Group::ROTATE) {
+                    int i, c = 0;
+                    for(i = 0; i < SS.constraint.n; i++) {
+                        if(SS.constraint.elem[i].group.v == g->h.v) c++;
+                    }
+                    // If the group does not contain any constraints, then
+                    // set the numerical guess to space the copies uniformly
+                    // over one rotation. Don't touch the guess if we're
+                    // already constrained, because that would break
+                    // convergence.
+                    if(c == 0) {
+                        SS.GetParam(g->h.param(3))->val = PI/(2*ev);
+                    }
+                }
 
                 SS.MarkGroupDirty(g->h);
                 SS.later.generateAll = true;