diff --git a/README.md b/README.md
index 7786ac6..6067807 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# NumberSpinner
+# budibase-component-number-spinner
 
 A Budibase **number field form input wrapper** for https://github.com/bohnacker/svelte-number-spinner
 
@@ -6,19 +6,9 @@ A Budibase **number field form input wrapper** for https://github.com/bohnacker/
 
 
 # Description
-A number input that can be controlled with the mouse and keyboard
+A number input that can be controlled with the mouse and keyboard.
 
-Find out more about [Budibase](https://github.com/Budibase/budibase).
+Adjust the mininum and maximum values, as well as the speed, decimals and step of the spinner. 
 
-## Instructions
-
-To build your new  plugin run the following in your Budibase CLI:
-```
-budi plugins --build
-```
-
-You can also re-build everytime you make a change to your plugin with the command:
-```
-budi plugins --watch
-```
+You can check the circular checkbox to loop the max into the min value and vice-versa
 
diff --git a/package.json b/package.json
index d71389f..9ae2791 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "NumberSpinner",
-  "version": "1.0.0",
+  "name": "budibase-component-number-spinner",
+  "version": "1.1.0",
   "description": "A number input that can be controlled with the mouse and keyboard",
   "license": "MIT",
   "svelte": "index.js",
diff --git a/schema.json b/schema.json
index 98c8e53..9d40148 100644
--- a/schema.json
+++ b/schema.json
@@ -2,7 +2,7 @@
   "type": "component",
   "metadata": {},
   "schema": {
-    "name": "NumberSpinner",
+    "name": "budibase-component-number-spinner",
     "friendlyName": "Number Spinner",
     "description": "A number input that can be controlled with the mouse and keyboard",
     "icon": "MoveLeftRight",
@@ -13,6 +13,11 @@
         "label": "Field",
         "required": true
       },
+      {
+        "type": "text",
+        "label": "Label",
+        "key": "label"
+      },
       {
         "type": "select",
         "label": "Alignment",
@@ -78,6 +83,42 @@
             "value": "XXXL"
           }
         ]
+      },
+      {
+        "type": "number",
+        "label": "Min",
+        "key": "min",
+        "defaultValue": -1000
+      },
+      {
+        "type": "number",
+        "label": "Max",
+        "key": "max",
+        "defaultValue": 1000
+      },
+      {
+        "type": "number",
+        "label": "Speed",
+        "key": "speed",
+        "defaultValue": 1
+      },
+      {
+        "type": "number",
+        "label": "Decimals",
+        "key": "decimals",
+        "defaultValue": 0
+      },
+      {
+        "type": "text",
+        "label": "Step",
+        "key": "step",
+        "defaultValue": 1
+      },
+      {
+        "type": "boolean",
+        "label": "Circular",
+        "key": "circular",
+        "defaultValue": false
       }
     ]
   }
diff --git a/src/Component.svelte b/src/Component.svelte
index fe2784b..2e89cab 100644
--- a/src/Component.svelte
+++ b/src/Component.svelte
@@ -1,10 +1,18 @@
 <script>
   import { getContext, onDestroy } from "svelte"
   import NumberSpinner from "svelte-number-spinner";
+  import Label from "./Label.svelte";
 
   export let field
+  export let label
   export let align
   export let size
+  export let min
+  export let max
+  export let step
+  export let speed
+  export let decimals
+  export let circular
 
   let fieldApi
   let fieldState
@@ -24,13 +32,28 @@
     fieldApi?.deregister();
     unsubscribe?.();
   });
+
+  const parseStep = () => {
+    let parsedStep = parseFloat(step)
+    if (parsedStep && !isNaN(parsedStep)) {
+      return parsedStep
+    }
+    return 1
+  }
 </script>
 
 <div use:styleable={$component.styles}>
   {#if !formContext}
     <div class="placeholder">Form components need to be wrapped in a form.</div>
   {:else}
+    <Label>{label}</Label>
     <NumberSpinner 
+      min={min || -1000}
+      max={max || 1000}
+      step={parseStep(step)}
+      speed={speed || 1}
+      decimals={decimals || 0}
+      circular={circular || false}
       class={`spectrum-Textfield spectrum-Textfield-input spectrum-Heading--size${size || "M"}`}
       mainStyle={`text-align: ${align}; height:auto;`}
       value={fieldState?.value}
diff --git a/src/Label.svelte b/src/Label.svelte
new file mode 100644
index 0000000..54b5d5c
--- /dev/null
+++ b/src/Label.svelte
@@ -0,0 +1,26 @@
+<script>
+    import "@spectrum-css/fieldlabel/dist/index-vars.css"
+  
+    export let size = "M"
+    export let muted
+  </script>
+  
+    <label
+      class:muted
+      for=""
+      class={`spectrum-FieldLabel spectrum-FieldLabel--size${size}`}
+    >
+      <slot />
+    </label>
+  
+  <style>
+    label {
+      padding: 0;
+      white-space: nowrap;
+      color: var(--spectrum-global-color-gray-700);
+    }
+  
+    .muted {
+      opacity: 0.5;
+    }
+  </style>
\ No newline at end of file