diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java
index 84e388e..4443853 100644
--- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java
+++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java
@@ -161,7 +161,7 @@ public class SchematicCommand extends SWCommand {
 
     @Register("save")
     @Register("s")
-    public void saveSchem(Player player, @Mapper("stringMapper") String name, @OptionalValue("false") boolean overwrite) {
+    public void saveSchem(Player player, @Mapper("stringMapper") String name, @StaticValue(value = {"", "-f"}, allowISE=true) @OptionalValue("") boolean overwrite) {
         SteamwarUser user = getUser(player);
         if(BauServerInfo.isBauServer() && BauServerInfo.getOwnerId() != user.getId() &&
                 (Punishment.isPunished(user, Punishment.PunishmentType.NoSchemReceiving, punishment ->
@@ -767,7 +767,9 @@ public class SchematicCommand extends SWCommand {
         return new TypeMapper<String>() {
             @Override
             public List<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
-                return SchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s);
+                List<String> list = SchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s);
+                list.add(s);
+                return list;
             }
 
             @Override