diff --git a/py_maker/pymaker.py b/py_maker/pymaker.py
index 13ba1e23..bc180b50 100644
--- a/py_maker/pymaker.py
+++ b/py_maker/pymaker.py
@@ -221,6 +221,12 @@ def post_process(self) -> None:
         proj_loc = (
             self.location if self.location != "." else self.choices.project_dir
         )
+        run_cmd = (
+            f"{self.location}"
+            if not self.choices.standalone
+            else "python main.py"
+        )
+
         output = f"""
 --> [green]Project created successfully.[/green]
 
@@ -233,7 +239,7 @@ def post_process(self) -> None:
     3) Activate the virtual environment:
         'poetry shell'
     4) Run the application:
-        '{self.location}'
+        '{run_cmd}'
     5) Code!
 
 See the [bold][green]README.md[/green][/bold] file for more information.
@@ -313,11 +319,16 @@ def get_input(self) -> None:
                 if self.settings.github_username
                 else "<your GitHub username>"
             )
+            repo_name = (
+                sanitize(self.choices.project_dir.name)
+                if self.choices.package_name == "-"
+                else self.choices.package_name
+            )
             self.choices.repository = Prompt.ask(
                 "Repository URL?",
                 default=(
                     f"https://github.com/{github_username}/"
-                    f"{re.sub(r'[_.]+', '-', self.choices.package_name)}"
+                    f"{re.sub(r'[_.]+', '-', repo_name.lower())}"
                 ),
             )
 
diff --git a/py_maker/template/pyproject.toml.jinja b/py_maker/template/pyproject.toml.jinja
index a740f8dc..4afac6bc 100644
--- a/py_maker/template/pyproject.toml.jinja
+++ b/py_maker/template/pyproject.toml.jinja
@@ -23,6 +23,10 @@ repository = "{{ repository }}"
 # rename "{{ slug }}" below to change the executable name. You can also
 # add more scripts if your package offers multiple commands.
 {{ slug }} = "{{ package_name }}.main:app"
+
+{% else%}
+package-mode = false
+
 {% endif %}
 
 [tool.poetry.dependencies]