diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java
index 9ab3fbf08..80e9297a3 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/Action.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java
@@ -89,10 +89,8 @@ public class Action implements IAction {
                 executeTask();
         }
 
-        if (maxCount > -1 && count >= maxCount) {
+        if (maxCount > -1 && count >= maxCount)
             markDone();
-            return;
-        }
 
         duration++;
     }
@@ -145,8 +143,8 @@ public class Action implements IAction {
     }
 
     @Override
-    public IAction setMaxDuration(int x) {
-        this.maxDuration = Math.max(-1, x);
+    public IAction setMaxDuration(int ticks) {
+        this.maxDuration = Math.max(-1, ticks);
         return this;
     }
 
@@ -156,8 +154,8 @@ public class Action implements IAction {
     }
 
     @Override
-    public IAction times(int x) {
-        this.maxCount = Math.max(-1, x);
+    public IAction times(int n) {
+        this.maxCount = Math.max(-1, n);
         return this;
     }
 
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java
index 3e2dc4bc4..37b806d01 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java
@@ -285,6 +285,21 @@ public class ActionManager implements IActionManager {
         ((Action) action).isScheduled = true;
         return action;
     }
+
+    @Override
+    public IAction scheduleParallel(Consumer<IAction> task) {
+        return scheduleParallel(create(task));
+    }
+
+    @Override
+    public IAction scheduleParallel(int delay, Consumer<IAction> task) {
+        return scheduleParallel(create(delay, task));
+    }
+    @Override
+    public IAction scheduleParallel(int maxDuration, int delay, Consumer<IAction> task) {
+        return scheduleParallel(create(maxDuration, delay, task));
+    }
+
     @Override
     public IAction scheduleParallel(String name, Consumer<IAction> task) {
         return scheduleParallel(create(name, task));
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
index 71a3df76b..4e53bef50 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
@@ -120,7 +120,7 @@ public class ConditionalAction extends Action implements IConditionalAction {
 
     @Override
     public IConditionalAction setMaxChecks(int maxChecks) {
-        this.maxChecks = maxChecks;
+        this.maxChecks = Math.max(-1, maxChecks);
         return this;
     }