fillForm - fixed loading extra element data
Using a clojure (function) to get the data preserves the variables while
waiting for async return
Added some comments and cleaned up fillFormCtrl