diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 87c25d0c..d742bb98 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -688,10 +688,11 @@ export default {
         return;
       }
 
-      console.log("gzform::fieldValueChanged, values:", {
-        ref: ref,
-        formstate: vm.formState
-      });
+      // console.log("gzform::fieldValueChanged, values:", {
+      //   ref: ref,
+      //   objValue: vm[ref],
+      //   refValue: vm.$refs[ref].value
+      // });
 
       //If ref appears in the formState.serverErrors details collection, remove each one
       let m = window.$gz._.remove(vm.formState.serverError.details, function(
diff --git a/ayanova/src/components/currency-control.vue b/ayanova/src/components/currency-control.vue
index 3a335783..9b8db5c6 100644
--- a/ayanova/src/components/currency-control.vue
+++ b/ayanova/src/components/currency-control.vue
@@ -3,7 +3,7 @@
     <v-text-field
       ref="textField"
       :value="currencyValue"
-      @input="updateValue"
+      @change="updateValue"
       v-currency="{
         currency: currencyName,
         locale: languageName
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 718635fa..a34378e2 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container fluid>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
-    {{ formState }}
+    <!-- {{ formState }} -->
     <v-row v-if="formState.ready">
       <v-col>
         <v-form ref="form">
@@ -281,12 +281,18 @@ export default {
         if (this.$route.params.obj) {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
-          vm.formState.loading = false; //here we handle it immediately
+          window.$gz.form.setFormState({
+            vm: vm,
+            loading: false
+          });
         } else {
           await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
         }
       } else {
-        vm.formState.loading = false; //here we handle it immediately
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
       }
       window.$gz.form.setFormState({
         vm: vm,
@@ -412,7 +418,10 @@ export default {
     },
     async getDataFromApi(recordId) {
       let vm = this;
-      vm.formState.loading = true;
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: true
+      });
       if (!recordId) {
         throw FORM_KEY + "::getDataFromApi -> Missing recordID!";
       }
@@ -449,7 +458,10 @@ export default {
       } catch (error) {
         window.$gz.errorHandler.handleFormError(error, vm);
       } finally {
-        vm.formState.loading = false;
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
       }
     },
     async submit() {
@@ -459,7 +471,10 @@ export default {
       }
 
       try {
-        vm.formState.loading = true;
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
         let url = API_BASE_URL; // + vm.$route.params.recordid;
         //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
@@ -499,7 +514,10 @@ export default {
       } catch (ex) {
         window.$gz.errorHandler.handleFormError(ex, vm);
       } finally {
-        vm.formState.loading = false;
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
       }
     },
     async remove() {
@@ -511,7 +529,10 @@ export default {
         }
 
         //do the delete
-        vm.formState.loading = true;
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
         //No need to delete a new record, just abandon it...
         if (vm.$route.params.recordid == 0) {
           //this should not get offered for delete but to be safe and clear just in case:
@@ -548,7 +569,10 @@ export default {
       if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
         return;
       }
-      vm.formState.loading = true;
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: true
+      });
       let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
 
       try {
@@ -570,7 +594,10 @@ export default {
       } catch (ex) {
         window.$gz.errorHandler.handleFormError(ex, vm);
       } finally {
-        vm.formState.loading = false;
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
       }
     }
   }