diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 000000000..aaf0dab9c
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,6 @@
+v0.0.4
+------
+* Fieldsets now properly merge schema defaults.
+* Directives for "manual" decorator usage.
+* Basic support for buttons.
+* Basic support for custom validation error messages.
diff --git a/README.md b/README.md
index c3c2c579a..c67e0997a 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Schema Form currently supports the following form field types:
 |:--------------|:------------------------|
 | fieldset      |  a fieldset with legend |
 | section       |  just a div             |
-| actions       |  horizontal button list, can only submit buttons as items |
+| actions       |  horizontal button list, can only submit and buttons as items |
 | text          |  input with type text   |
 | textarea      |  a textarea             |
 | number        |  input type number      |
@@ -69,6 +69,7 @@ Schema Form currently supports the following form field types:
 | checkboxes    |  list of checkboxes     |
 | select        |  a select (single value)|
 | submit        |  a submit button        |
+| button        |  a button               |
 
 
 
@@ -171,6 +172,29 @@ General options most field types can handle:
   title: "Street",            //Title of field, taken from schema if available
   notitle: false,             //Set to true to hide title
   description: "Street name", //A description, taken from schema if available
+  validationMessage: "Oh noes, please write a proper address"  //A custom validation error message
+}
+```
+
+Validation Messages
+-------------------
+Per default all error messages but "Required" comes from the schema validator
+[tv4](https://github.com/geraintluff/tv4), this might or might not work for you.
+If you supply a ´´´validationMessage´´´ proṕerty in the form definition, and if its value is a
+string that will be used instead on any validation error.
+
+If you need more fine grained control you can supply an object instead with keys matching the error
+codes of [tv4](https://github.com/geraintluff/tv4). See ```tv4.errorCodes```
+
+Ex.
+```javascript
+{
+  key: "address.street",
+  validationMessage: {
+    tv4.errorCodes.STRING_LENGTH_SHORT: "Address is too short, man.",
+    "default": "Just write a proper address, will you?",   //Special catch all error message
+    "required": "I needz an address plz"                   //Used for required if specified
+  }
 }
 ```
 
@@ -209,7 +233,16 @@ and the value is the title of the option.
   type: "actions",
   items: [
     { type: 'submit', title: 'Ok' }
+    { type: 'button', title: 'Cancel', onClick: "cancel()" }
   ]
 }
 ```
 
+*button* can have a ```onClick``` attribute that either, as in JSON Form, is a function *or* a
+string with an angular expression, as with ng-click.
+[
+  { type: 'button', title: 'Ok', onClick: function(){ ...  } }
+  { type: 'button', title: 'Cancel', onClick: "cancel()" }
+[
+```
+
diff --git a/bower.json b/bower.json
index f01b764e2..363afd744 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "authors": [
     "Textalk",
     "David Jensen <david.lgj@gmail.com>"
diff --git a/dist/bootstrap-decorator.min.js b/dist/bootstrap-decorator.min.js
index 45acec573..3ddc52176 100644
--- a/dist/bootstrap-decorator.min.js
+++ b/dist/bootstrap-decorator.min.js
@@ -1 +1 @@
-!function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/actions.html",'<div class="btn-group"><input ng-repeat-start="item in form.items" type="submit" class="btn btn-primary" value="{{item.title}}" ng-if="item.type === \'submit\'"><button ng-repeat-end="" class="btn btn-default" ng-if="item.type !== \'submit\'">{{item.title}}</button></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/checkbox.html",'<div class="checkbox" ng-class="{\'has-error\': hasError()}"><label><input type="checkbox" ng-model="$$value$$" schema-validate="form.schema" ng-required="form.required">{{form.title}}</label><span class="help-block" ng-show="form.description">{{form.description}}</span></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/checkboxes.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}" ng-init="checkboxValues = {}"><label ng-show="showTitle()">{{form.title}}</label><div class="checkbox" ng-repeat="(value,name) in form.titleMap"><label><input type="checkbox" ng-model="checkboxValues[value]" ng-change="$$value$$ = checkboxValuesToList(checkboxValues)">{{name}}</label></div><span class="help-block" ng-show="form.description">{{form.description}}</span></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/default.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}"><label ng-show="showTitle()">{{form.title}}</label><input type="{{form.type}}" placeholder="{{form.placeholder}}" class="form-control" ng-required="form.required" ng-model="$$value$$" schema-validate="form.schema"><span class="help-block" ng-show="form.description && !hasError()">{{form.description}}</span> <span class="help-block" ng-show="hasError()">{{schemaError}}</span></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/fieldset.html",'<fieldset ng-disabled="form.readonly"><legend ng-show="form.title">{{ form.title }}</legend><bootstrap-decorator ng-repeat="item in form.items" form="item"></bootstrap-decorator></fieldset>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/readonly.html",'<div class="form-group"><label ng-show="showTitle()">{{form.title}}</label><input ng-if="form.type !== \'textarea\'" type="text" disabled="" class="form-control" value="{{$$value$$}}"><textarea ng-if="form.type === \'textarea\'" disabled="" class="form-control">{{$$value$$}}</textarea> <span class="help-block" ng-show="form.description">{{form.description}}</span></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/section.html",'<div><bootstrap-decorator ng-repeat="item in form.items" form="item"></bootstrap-decorator></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/select.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}"><label ng-show="showTitle()">{{form.title}}</label><select ng-model="$$value$$" class="form-control" schema-validate="form.schema" ng-required="form.required" ng-options="val as name for (val,name) in form.titleMap"></select><span class="help-block" ng-show="form.description && !hasError()">{{form.description}}</span> <span class="help-block" ng-show="hasError()">{{schemaError}}</span></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/submit.html",'<div class="form-group"><input type="submit" class="btn btn-primary" value="{{form.title}}"></div>')}])}(),function(e){try{e=angular.module("schemaForm")}catch(r){e=angular.module("schemaForm",[])}e.run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/textarea.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}"><label ng-show="showTitle()">{{form.title}}</label><textarea class="form-control" ng-required="form.required" ng-model="$$value$$" schema-validate="form.schema"></textarea> <span class="help-block" ng-show="form.description && !hasError()">{{form.description}}</span> <span class="help-block" ng-show="hasError()">{{schemaError}} {{ngModel.$error}}</span></div>')}])}(),angular.module("schemaForm").config(["schemaFormDecoratorsProvider",function(e){e.create("bootstrapDecorator",{textarea:"directives/decorators/bootstrap/textarea.html",fieldset:"directives/decorators/bootstrap/fieldset.html",section:"directives/decorators/bootstrap/section.html",actions:"directives/decorators/bootstrap/actions.html",select:"directives/decorators/bootstrap/select.html",checkbox:"directives/decorators/bootstrap/checkbox.html",checkboxes:"directives/decorators/bootstrap/checkboxes.html",number:"directives/decorators/bootstrap/default.html",submit:"directives/decorators/bootstrap/submit.html","default":"directives/decorators/bootstrap/default.html"},[function(e){return e.readonly&&e.key&&"fieldset"!==e.type?"directives/decorators/bootstrap/readonly.html":void 0}])}]);
\ No newline at end of file
+angular.module("schemaForm").run(["$templateCache",function(e){e.put("directives/decorators/bootstrap/actions-trcl.html",'<div class="btn-group" ng-transclude=""></div>'),e.put("directives/decorators/bootstrap/actions.html",'<div class="btn-group"><input ng-repeat-start="item in form.items" type="submit" class="btn btn-primary" value="{{item.title}}" ng-if="item.type === \'submit\'"><button ng-repeat-end="" class="btn btn-default" type="button" ng-if="item.type !== \'submit\'" ng-click="buttonClick($event,item)">{{item.title}}</button></div>'),e.put("directives/decorators/bootstrap/checkbox.html",'<div class="checkbox" ng-class="{\'has-error\': hasError()}"><label><input type="checkbox" ng-model="$$value$$" schema-validate="form.schema" ng-required="form.required">{{form.title}}</label><span class="help-block" ng-show="form.description">{{form.description}}</span></div>'),e.put("directives/decorators/bootstrap/checkboxes.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}" ng-init="checkboxValues = {}"><label ng-show="showTitle()">{{form.title}}</label><div class="checkbox" ng-repeat="(value,name) in form.titleMap"><label><input type="checkbox" ng-model="checkboxValues[value]" ng-change="$$value$$ = checkboxValuesToList(checkboxValues)">{{name}}</label></div><span class="help-block" ng-show="form.description">{{form.description}}</span></div>'),e.put("directives/decorators/bootstrap/default.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}"><label ng-show="showTitle()">{{form.title}}</label><input ng-show="form.key" type="{{form.type}}" placeholder="{{form.placeholder}}" class="form-control" ng-required="form.required" ng-model="$$value$$" schema-validate="form.schema"><span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span></div>'),e.put("directives/decorators/bootstrap/fieldset-trcl.html",'<fieldset ng-disabled="form.readonly"><legend ng-show="form.title">{{ form.title }}</legend><div ng-transclude=""></div></fieldset>'),e.put("directives/decorators/bootstrap/fieldset.html",'<fieldset ng-disabled="form.readonly"><legend ng-show="form.title">{{ form.title }}</legend><sf-decorator ng-repeat="item in form.items" form="item"></sf-decorator></fieldset>'),e.put("directives/decorators/bootstrap/readonly.html",'<div class="form-group"><label ng-show="showTitle()">{{form.title}}</label><input ng-if="form.type !== \'textarea\'" type="text" disabled="" class="form-control" value="{{$$value$$}}"><textarea ng-if="form.type === \'textarea\'" disabled="" class="form-control">{{$$value$$}}</textarea> <span class="help-block" ng-show="form.description">{{form.description}}</span></div>'),e.put("directives/decorators/bootstrap/section.html",'<div><bootstrap-decorator ng-repeat="item in form.items" form="item"></bootstrap-decorator></div>'),e.put("directives/decorators/bootstrap/select.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}"><label ng-show="showTitle()">{{form.title}}</label><select ng-model="$$value$$" class="form-control" schema-validate="form.schema" ng-required="form.required" ng-options="val as name for (val,name) in form.titleMap"></select><span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span></div>'),e.put("directives/decorators/bootstrap/submit.html",'<div class="form-group"><input type="submit" class="btn btn-primary" value="{{form.title}}" ng-if="form.type === \'submit\'"><button class="btn btn-default" type="button" ng-click="buttonClick($event,form)" ng-if="form.type !== \'submit\'">{{form.title}}</button></div>'),e.put("directives/decorators/bootstrap/textarea.html",'<div class="form-group" ng-class="{\'has-error\': hasError()}"><label ng-show="showTitle()">{{form.title}}</label><textarea class="form-control" ng-required="form.required" ng-model="$$value$$" schema-validate="form.schema"></textarea> <span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span></div>')}]),angular.module("schemaForm").config(["schemaFormDecoratorsProvider",function(e){var t="directives/decorators/bootstrap/";e.createDecorator("bootstrapDecorator",{textarea:t+"textarea.html",fieldset:t+"fieldset.html",section:t+"section.html",actions:t+"actions.html",select:t+"select.html",checkbox:t+"checkbox.html",checkboxes:t+"checkboxes.html",number:t+"default.html",submit:t+"submit.html",button:t+"submit.html","default":t+"default.html"},[function(e){return e.readonly&&e.key&&"fieldset"!==e.type?t+"readonly.html":void 0}]),e.createDirectives({textarea:t+"textarea.html",select:t+"select.html",checkbox:t+"checkbox.html",checkboxes:t+"checkboxes.html",number:t+"default.html",submit:t+"submit.html",button:t+"submit.html",text:t+"default.html",date:t+"default.html",password:t+"default.html",input:t+"default.html"})}]).directive("sfFieldset",function(){return{transclude:!0,scope:!0,templateUrl:"directives/decorators/bootstrap/fieldset-trcl.html",link:function(e,t,r){e.title=e.$eval(r.title)}}});
\ No newline at end of file
diff --git a/dist/schema-form.min.js b/dist/schema-form.min.js
index 835d0daa8..192062728 100644
--- a/dist/schema-form.min.js
+++ b/dist/schema-form.min.js
@@ -1 +1 @@
-angular.module("schemaForm",[]),angular.module("schemaForm").provider("schemaFormDecorators",["$compileProvider",function(e){var r="",t={},n=function(e,n){"sfDecorator"===e&&(e=r);for(var a=t[e],i=a.rules,o=0;o<i.length;o++){var u=i[o](n);if(u)return u}return a.mappings[n.type]?a.mappings[n.type]:a.mappings["default"]},a=function(r){e.directive(r,["$parse","$compile","$http","$templateCache",function(e,t,a,i){return{restrict:"AE",replace:!0,transclude:!1,scope:!0,link:function(e,o,u){var c=e.$watch(u.form,function(u){if(u){e.form=u;var m=n(r,u);a.get(m,{cache:i}).then(function(r){var n=r.data.replace(/\$\$value\$\$/g,"model."+u.key);t(n)(e,function(e){o.replaceWith(e)})}),c()}});e.showTitle=function(){return e.form&&e.form.notitle!==!0&&e.form.title},e.checkboxValuesToList=function(e){var r=[];return angular.forEach(e,function(e,t){e&&r.push(t)}),r}}}}])};this.create=function(e,n,i){t[e]={mappings:n||{},rules:i||[]},t[r]||(r=e),a(e)},this.directive=function(e){return e=e||r,t[e]},this.$get=function(){return{directive:function(e){return t[e]},defaultDecorator:r}},a("sfDecorator")}]),angular.module("schemaForm").factory("schemaForm",[function(){var e={};e.merge=function(r,t,n){t=t||["*"];var a=e.defaults(r,n),i=t.indexOf("*");if(-1!==i)return t=t.slice(0,i).concat(a.form).concat(t.slice(i+1));var o=a.lookup;return t.map(function(e){return"string"==typeof e&&(e={key:e}),e.key&&o[e.key]?angular.extend(o[e.key],e):e})};var r=function(e,r){var t={};return e.title&&(t.title=e.title),e.description&&(t.description=e.description),(r.required===!0||e.required===!0)&&(t.required=!0),e.default&&(t.default=e.default),e.maxLength&&(t.maxlength=e.maxLength),e.minLength&&(t.minlength=e.maxLength),(e.readOnly||e.readonly)&&(t.readonly=e.readOnly||e.readonly),e.minimum&&(t.minimum=e.minimum+(e.exclusiveMinimum?1:0)),e.maximum&&(t.maximum=e.maximum-(e.exclusiveMaximum?1:0)),t.schema=e,t},t=function(e,t,n){if("string"===t.type&&!t.enum){var a=r(t,n);return a.key=n.path,a.type="text",n.lookup[n.path]=a,a}},n=function(e,t,n){if("number"===t.type){var a=r(t,n);return a.key=n.path,a.type="number",n.lookup[n.path]=a,a}},a=function(e,t,n){if("integer"===t.type){var a=r(t,n);return a.key=n.path,a.type="number",n.lookup[n.path]=a,a}},i=function(e,t,n){if("boolean"===t.type){var a=r(t,n);return a.key=n.path,a.type="checkbox",n.lookup[n.path]=a,a}},o=function(e,t,n){if("string"===t.type&&t.enum){var a=r(t,n);return a.key=n.path,a.type="select",a.titleMap={},t.enum.forEach(function(e){a.titleMap[e]=e}),n.lookup[n.path]=a,a}},u=function(e,t,n){if("array"===t.type&&t.items&&t.items.enum){var a=r(t,n);return a.key=n.path,a.type="checkboxes",a.titleMap={},t.items.enum.forEach(function(e){a.titleMap[e]=e}),n.lookup[n.path]=a,a}},c=function(e,t,n){if("object"===t.type){var a=r(t,n);return a.type="fieldset",a.items=[],angular.forEach(t.properties,function(e,r){var i=n.path+"."+r;if(n.ignore[i]!==!0){var o=t.required&&-1!==t.required.indexOf(r),u=l(r,e,{path:i,required:o||!1,lookup:n.lookup,ignore:n.ignore});u&&a.items.push(u)}}),a}},m=[t,o,c,n,a,i,u],l=function(e,r,t){for(var n,a=0;a<m.length;a++)if(n=m[a](e,r,t))return n};return e.defaults=function(e,r){var t=[],n={};if(r=r||{},"object"!==e.type)throw new Exception('Not implemented. Only type "object" allowed at root level of schema.');return angular.forEach(e.properties,function(a,i){if(r[i]!==!0){var o=e.required&&-1!==e.required.indexOf(i),u=l(i,a,{path:i,lookup:n,ignore:r,required:o});u&&t.push(u)}}),{form:t,lookup:n}},e}]),angular.module("schemaForm").directive("sfSchema",["$compile","schemaForm","schemaFormDecorators",function(e,r,t){function n(e,r){return r=r||"_",e.replace(i,function(e,t){return(t?r:"")+e.toLowerCase()})}var a=function(e,r,t){t=t||"",r(e,t),angular.forEach(e.properties,function(e,n){a(e,r,""===t?n:t+"."+n)})},i=/[A-Z]/g;return{scope:{schema:"=sfSchema",initialForm:"=sfForm",model:"=sfModel"},replace:!1,restrict:"A",transclude:!0,require:"?form",link:function(i,o,u,c,m){i.formCtrl=c;var l={};m(i,function(e){e.addClass("schema-form-ignore"),o.prepend(e),o.find("[ng-model]").each(function(){var e=this.getAttribute("ng-model");l[e.substring(e.indexOf(".")+1)]=!0})});var f={};i.$watch(function(){var c=i.schema,m=i.initialForm||["*"];if(m&&c&&(f.form!==m||f.schema!==c)){f.schema=c,f.form=m;var s=r.merge(c,m,l),p=document.createDocumentFragment();i.schemaForm={form:s,schema:c},angular.forEach(s,function(e,r){var a=document.createElement(u.sfDecorator||n(t.defaultDecorator,"-"));a.setAttribute("form","schemaForm.form["+r+"]"),p.appendChild(a)}),o.children(":not(.schema-form-ignore)").remove(),o[0].appendChild(p),e(o.children())(i),a(c,function(e,r){angular.isDefined(e["default"])&&i.$eval("model."+r+" = model."+r+" || defaltValue",{defaltValue:e["default"]})})}})}}}]),angular.module("schemaForm").directive("schemaValidate",function(){return{restrict:"A",scope:!1,require:"ngModel",link:function(e,r,t,n){e.ngModel=n;var a=e.$eval(t.schemaValidate);n.$parsers.unshift(function(r){if(a||(a=e.$eval(t.schemaValidate)),angular.isUndefined(r))return void 0;var i=r;"integer"===a.type?i=parseInt(i,10):"number"===a.type?i=parseFloat(i,10):"boolean"===a.type&&"string"==typeof r&&("true"===r?i=!0:"false"===r&&(i=!1));var o=tv4.validateResult(i,a);return o.valid?(n.$setValidity("schema",!0),r):(n.$setValidity("schema",!1),void(e.schemaError=o.error.message))}),e.hasError=function(){return e.ngModel.$invalid&&!e.ngModel.$pristine}}}});
\ No newline at end of file
+angular.module("schemaForm",[]),angular.module("schemaForm").provider("schemaFormDecorators",["$compileProvider",function(e){var r="",t={},n=function(e,n){"sfDecorator"===e&&(e=r);for(var a=t[e],i=a.rules,o=0;o<i.length;o++){var u=i[o](n);if(u)return u}return a.mappings[n.type]?a.mappings[n.type]:a.mappings["default"]},a=function(r){e.directive(r,["$parse","$compile","$http","$templateCache",function(e,t,a,i){return{restrict:"AE",replace:!0,transclude:!1,scope:!0,require:"?^sfSchema",link:function(e,o,u,c){var l=e.$watch(u.form,function(u){if(u){e.form=u;var c=n(r,u);a.get(c,{cache:i}).then(function(r){var n=r.data.replace(/\$\$value\$\$/g,"model."+(u.key||""));t(n)(e,function(e){o.replaceWith(e)})}),l()}});e.showTitle=function(){return e.form&&e.form.notitle!==!0&&e.form.title},e.checkboxValuesToList=function(e){var r=[];return angular.forEach(e,function(e,t){e&&r.push(t)}),r},e.buttonClick=function(r,t){angular.isFunction(t.onClick)?t.onClick(r,t):angular.isString(t.onClick)&&(c?c.evalInParentScope(t.onClick,{$event:r,form:t}):e.$eval(t.onClick,{$event:r,form:t}))},e.errorMessage=function(r){return e.form.validationMessage?r?angular.isString(e.form.validationMessage)?e.form.validationMessage:e.form.validationMessage[r.code]||e.form.validationMessage["default"]:e.form.validationMessage.required||e.form.validationMessage["default"]||e.form.validationMessage:r?r.message:"Required"}}}}])},i=function(r,t,n){n=angular.isDefined(n)?n:!1,e.directive("sf"+angular.uppercase(r[0])+r.substr(1),function(){return{restrict:"EAC",scope:!0,replace:!0,transclude:n,template:'<sf-decorator form="form"></sf-decorator>',link:function(e,t,n){var a={items:"c",titleMap:"c",schema:"c"},i={type:r},o=!0;angular.forEach(n,function(r,t){if("$"!==t[0]&&0!==t.indexOf("ng")&&"sfField"!==t){var u=function(r){angular.isDefined(r)&&r!==i[t]&&(i[t]=r,o&&i.type&&(i.key||angular.isUndefined(n.key))&&(e.form=i,o=!1))};"model"===t?e.$watch(r,function(r){r&&e.model!==r&&(e.model=r)}):"c"===a[t]?e.$watchCollection(r,u):n.$observe(t,u)}})}}})};this.createDecorator=function(e,n,i){t[e]={mappings:n||{},rules:i||[]},t[r]||(r=e),a(e)},this.createDirective=i,this.createDirectives=function(e){angular.forEach(e,function(e,r){i(r,e)})},this.directive=function(e){return e=e||r,t[e]},this.$get=function(){return{directive:function(e){return t[e]},defaultDecorator:r}},a("sfDecorator")}]),angular.module("schemaForm").factory("schemaForm",[function(){var e={};e.merge=function(r,t,n){t=t||["*"];var a=e.defaults(r,n),i=t.indexOf("*");if(-1!==i)return t=t.slice(0,i).concat(a.form).concat(t.slice(i+1));var o=a.lookup;return t.map(function(t){return"string"==typeof t&&(t={key:t}),t.items&&(t.items=e.merge(r,t.items,n)),t.key&&o[t.key]?angular.extend(o[t.key],t):t})};var r=function(e,r){var t={};return e.title&&(t.title=e.title),e.description&&(t.description=e.description),(r.required===!0||e.required===!0)&&(t.required=!0),e.default&&(t.default=e.default),e.maxLength&&(t.maxlength=e.maxLength),e.minLength&&(t.minlength=e.maxLength),(e.readOnly||e.readonly)&&(t.readonly=e.readOnly||e.readonly),e.minimum&&(t.minimum=e.minimum+(e.exclusiveMinimum?1:0)),e.maximum&&(t.maximum=e.maximum-(e.exclusiveMaximum?1:0)),e.validationMessage&&(t.validationMessage=e.validationMessage),e.enumNames&&(t.titleMap=e.enumNames),t.schema=e,t},t=function(e,t,n){if("string"===t.type&&!t.enum){var a=r(t,n);return a.key=n.path,a.type="text",n.lookup[n.path]=a,a}},n=function(e,t,n){if("number"===t.type){var a=r(t,n);return a.key=n.path,a.type="number",n.lookup[n.path]=a,a}},a=function(e,t,n){if("integer"===t.type){var a=r(t,n);return a.key=n.path,a.type="number",n.lookup[n.path]=a,a}},i=function(e,t,n){if("boolean"===t.type){var a=r(t,n);return a.key=n.path,a.type="checkbox",n.lookup[n.path]=a,a}},o=function(e,t,n){if("string"===t.type&&t.enum){var a=r(t,n);return a.key=n.path,a.type="select",a.titleMap||(a.titleMap={},t.enum.forEach(function(e){a.titleMap[e]=e})),n.lookup[n.path]=a,a}},u=function(e,t,n){if("array"===t.type&&t.items&&t.items.enum){var a=r(t,n);return a.key=n.path,a.type="checkboxes",a.titleMap||(a.titleMap={},t.items.enum.forEach(function(e){a.titleMap[e]=e})),n.lookup[n.path]=a,a}},c=function(e,t,n){if("object"===t.type){var a=r(t,n);return a.type="fieldset",a.items=[],n.lookup[n.path]=a,angular.forEach(t.properties,function(e,r){var i=n.path+"."+r;if(n.ignore[i]!==!0){var o=t.required&&-1!==t.required.indexOf(r),u=f(r,e,{path:i,required:o||!1,lookup:n.lookup,ignore:n.ignore});u&&a.items.push(u)}}),a}},l=[t,o,c,n,a,i,u],f=function(e,r,t){for(var n,a=0;a<l.length;a++)if(n=l[a](e,r,t))return n};return e.defaults=function(e,r){var t=[],n={};if(r=r||{},"object"!==e.type)throw new Exception('Not implemented. Only type "object" allowed at root level of schema.');return angular.forEach(e.properties,function(a,i){if(r[i]!==!0){var o=e.required&&-1!==e.required.indexOf(i),u=f(i,a,{path:i,lookup:n,ignore:r,required:o});u&&t.push(u)}}),{form:t,lookup:n}},e}]),angular.module("schemaForm").directive("sfSchema",["$compile","schemaForm","schemaFormDecorators",function(e,r,t){function n(e,r){return r=r||"_",e.replace(i,function(e,t){return(t?r:"")+e.toLowerCase()})}var a=function(e,r,t){t=t||"",r(e,t),angular.forEach(e.properties,function(e,n){a(e,r,""===t?n:t+"."+n)})},i=/[A-Z]/g;return{scope:{schema:"=sfSchema",initialForm:"=sfForm",model:"=sfModel"},controller:["$scope",function(e){this.evalInParentScope=function(r,t){e.$parent.$eval(r,t)}}],replace:!1,restrict:"A",transclude:!0,require:"?form",link:function(i,o,u,c,l){i.formCtrl=c;var f={};l(i,function(e){e.addClass("schema-form-ignore"),o.prepend(e),o.find("[ng-model]").each(function(){var e=this.getAttribute("ng-model");f[e.substring(e.indexOf(".")+1)]=!0})});var m={};i.$watch(function(){var c=i.schema,l=i.initialForm||["*"];if(l&&c&&(m.form!==l||m.schema!==c)){m.schema=c,m.form=l;var s=r.merge(c,l,f),p=document.createDocumentFragment();i.schemaForm={form:s,schema:c},angular.forEach(s,function(e,r){var a=document.createElement(u.sfDecorator||n(t.defaultDecorator,"-"));a.setAttribute("form","schemaForm.form["+r+"]"),p.appendChild(a)}),o.children(":not(.schema-form-ignore)").remove(),o[0].appendChild(p),e(o.children())(i),a(c,function(e,r){angular.isDefined(e["default"])&&i.$eval("model."+r+" = model."+r+" || defaltValue",{defaltValue:e["default"]})})}})}}}]),angular.module("schemaForm").directive("schemaValidate",function(){return{restrict:"A",scope:!1,require:"ngModel",link:function(e,r,t,n){e.ngModel=n;var a=null,i=e.$eval(t.schemaValidate);n.$parsers.unshift(function(r){if(i||(i=e.$eval(t.schemaValidate)),!i)return r;if(angular.isUndefined(r))return void 0;var o=r;"integer"===i.type?o=parseInt(o,10):"number"===i.type?o=parseFloat(o,10):"boolean"===i.type&&"string"==typeof r&&("true"===r?o=!0:"false"===r&&(o=!1));var u=tv4.validateResult(o,i);return u.valid?(n.$setValidity("schema",!0),a=null,r):(n.$setValidity("schema",!1),void(a=u.error))}),e.hasError=function(){return e.ngModel.$invalid&&!e.ngModel.$pristine},e.schemaError=function(){return a}}}});
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 92b6e226b..e031ab09b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,7 +2,7 @@
 
 var gulp = require('gulp');
 
-var ngHtml2Js = require("gulp-ng-html2js");
+var templateCache = require('gulp-angular-templatecache');
 var minifyHtml = require("gulp-minify-html");
 var concat = require("gulp-concat");
 var uglify = require("gulp-uglify");
@@ -18,9 +18,9 @@ gulp.task('bootstrap', function() {
                       spare: true,
                       quotes: true
                   }))
-                  .pipe(ngHtml2Js({
-                      moduleName: "schemaForm",
-                      prefix: "directives/decorators/bootstrap/"
+                  .pipe(templateCache({
+                      module: "schemaForm",
+                      root: "directives/decorators/bootstrap/"
                   }))
     );
     stream.queue(gulp.src('./src/directives/decorators/bootstrap/*.js'));
@@ -32,6 +32,7 @@ gulp.task('bootstrap', function() {
 
 });
 
+
 gulp.task('minify',function(){
   gulp.src([
     './src/module.js',
diff --git a/karma.conf.js b/karma.conf.js
index eb92edf4d..b2573771e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,8 +15,8 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'http://code.jquery.com/jquery-2.1.0.min.js',
-      'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.14/angular.min.js',
-      'http://code.angularjs.org/1.2.14/angular-mocks.js',
+      'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js',
+      'https://code.angularjs.org/1.2.16/angular-mocks.js',
       'bower_components/tv4/tv4.js',
       'src/module.js',
       'src/services/*.js',
@@ -81,7 +81,7 @@ module.exports = function(config) {
     // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
     // - PhantomJS
     // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
-    browsers: ['PhantomJS'],
+    browsers: [],
 
 
     // If browser does not capture in given timeout [ms], kill it
diff --git a/package.json b/package.json
index f17cf8916..0026404e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Create forms from a JSON schema",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -20,10 +20,10 @@
     "karma-growler-reporter": "0.0.1",
     "karma-ng-html2js-preprocessor": "^0.1.0",
     "gulp": "^3.5.6",
-    "gulp-ng-html2js": "^0.1.6",
     "gulp-uglify": "^0.2.1",
     "gulp-minify-html": "^0.1.1",
     "gulp-concat": "^2.2.0",
-    "streamqueue": "0.0.5"
+    "streamqueue": "0.0.5",
+    "gulp-angular-templatecache": "^1.1.1"
   }
 }
diff --git a/problem.txt b/problem.txt
deleted file mode 100644
index a4b5ca952..000000000
--- a/problem.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-Olika vägar frammåt:
-====================
-
-
-
-Problemställningen:
--------------------
-json-form fixar en hel del validering, dels genom att läggapå attribut som
-min och max på input och dels genom att validera via en schema validtor.
-
-Jag tänkte undvika validatorn och köra "the angular way" genom att ha all validering
-i formuläret via HTML5 valideringar och directives som ng-pattern, ng-maxlength osv
-antagligen ett par egna.
-
-Hittils har algoritmen sett ut såhär:
-#1 schema => defaultForm,
-#2 defaultForm+form => finalForm
-#3 loopa finalForm och skapa html, dvs all info för validering i formuläret.
-
-Kruxet är att formulär definitionen i json form *inte* innehåller tillräckligt med valideringar
-(den innehåller några) utan jag måste lägga till form attribut för dem. (json form tar dem från
-schemat)
-
-tex så om schema innehåller "maxLength" attribut så sätts "maxlength" på input fältet, men om form
-definitionen innehåller "maxLength" (eller "maxlength" för den delen) så händer inget.
-
-I min algoritm ovan där form definitionen måste innehålla all info för generering av html och
-de attribut som styr upp validering så måste jag helt enkelt hitta på eget.
-
-Frågan är hur ska detta egna se ut?
-
-
-#1 Egna form attribut
-När det inte finns ngt form attribut i json forms defintion så skapar jag ett eget, t.ex. så skulle
-maxLength bara kopieras till form objektet.
-+ minsta motståndets lag
-- kluddig lösning, motverkar lite att vara json form kompatibel
-- kan allt stödjas?
-
-
-#2 Eget schema directive
-Istället skapa ett eget directive som antingen validerar själv eller lägger till de attribut som
-behövs för att validera. Schemat fås genom require och ng-model värdet pekar ut vart i schemat.
-Kan möjligtvis implementeras med tv4.
-+ snygg lösning
-- krångligt directive, måste ta hänsyn till om tex maximum, required osv redan satts via form
-definitionen.
-
-
-
-
diff --git a/src/bootstrap-example.html b/src/bootstrap-example.html
index e865bb02f..11df7a66f 100644
--- a/src/bootstrap-example.html
+++ b/src/bootstrap-example.html
@@ -5,12 +5,19 @@
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
   <style type="text/css">
+
+  body,html {
+    min-height: 1400px;
+  }
+
   .red {
     border: 1px solid red;
     background: #fee;
   }
 
-  .ace_editor { height: 600px; font-size: 20px !important;}
+  .ace_editor { font-size: 20px !important;}
+  .form {  height: 400px;  }
+  .schema {  height: 800px;  }
   </style>
 </head>
 <body ng-controller="TestCtrl">
@@ -22,16 +29,16 @@ <h1>Schema Form Example</h1>
       <h3>The Generated Form</h3>
       <form name="ngform" sf-model="person" sf-form="form" sf-schema="schema" sf-decorator="{{decorator}}">
       </form>
+      <h3>Model</h3>
+      <pre>{{pretty()}}</pre>
     </div>
     <div class="col-sm-8">
-      <h3>Schema</h3>
-      <div ui-ace="{ theme: 'monokai',mode:'json'}"
-           ng-class="{red: !itParses}" rows="15" ng-model="schemaJson" class="form-control"></div>
       <h3>Form</h3>
       <div ui-ace="{ theme: 'monokai',mode:'json'}"
-           ng-class="{red: !itParsesForm}" rows="15" ng-model="formJson" class="form-control"></div>
-      <h3>Model</h3>
-      <pre>{{pretty()}}</pre>
+           ng-class="{red: !itParsesForm}" ng-model="formJson" class="form-control form"></div>
+      <h3>Schema</h3>
+      <div ui-ace="{ theme: 'monokai',mode:'json'}"
+           ng-class="{red: !itParses}" ng-model="schemaJson" class="form-control schema"></div>
     </div>
   </div>
 </div>
@@ -120,7 +127,7 @@ <h3>Model</h3>
       type: 'actions',
       items: [
         { type: 'submit', title: 'Do It!'},
-        { type: 'button', title: 'Noooooooooooo'}
+        { type: 'button', title: 'Noooooooooooo', onClick: 'sayNo()'}
       ]
     }
   ];
@@ -160,6 +167,9 @@ <h3>Model</h3>
   };
 
 
+  $scope.sayNo = function() {
+    alert('Noooooooo')
+  }
 
 }
 
diff --git a/src/directives/decorators/bootstrap/actions-trcl.html b/src/directives/decorators/bootstrap/actions-trcl.html
new file mode 100644
index 000000000..092439c40
--- /dev/null
+++ b/src/directives/decorators/bootstrap/actions-trcl.html
@@ -0,0 +1 @@
+<div class="btn-group" ng-transclude></div>
diff --git a/src/directives/decorators/bootstrap/actions.html b/src/directives/decorators/bootstrap/actions.html
index bb2be41da..2ed3bce84 100644
--- a/src/directives/decorators/bootstrap/actions.html
+++ b/src/directives/decorators/bootstrap/actions.html
@@ -4,5 +4,8 @@
          class="btn btn-primary"
          value="{{item.title}}"
          ng-if="item.type === 'submit'">
-  <button ng-repeat-end class="btn btn-default" ng-if="item.type !== 'submit'">{{item.title}}</button>
+  <button ng-repeat-end class="btn btn-default"
+          type="button"
+          ng-if="item.type !== 'submit'"
+          ng-click="buttonClick($event,item)">{{item.title}}</button>
 </div>
diff --git a/src/directives/decorators/bootstrap/bootstrap-decorator.js b/src/directives/decorators/bootstrap/bootstrap-decorator.js
index a3455b0d9..90146e5cd 100644
--- a/src/directives/decorators/bootstrap/bootstrap-decorator.js
+++ b/src/directives/decorators/bootstrap/bootstrap-decorator.js
@@ -1,25 +1,51 @@
 angular.module('schemaForm').config(['schemaFormDecoratorsProvider',function(decoratorsProvider){
+  var base = 'directives/decorators/bootstrap/';
 
-  decoratorsProvider.create('bootstrapDecorator',{
-    textarea: 'directives/decorators/bootstrap/textarea.html',
-    fieldset: 'directives/decorators/bootstrap/fieldset.html',
-    section: 'directives/decorators/bootstrap/section.html',
-    actions: 'directives/decorators/bootstrap/actions.html',
-    select: 'directives/decorators/bootstrap/select.html',
-    checkbox: 'directives/decorators/bootstrap/checkbox.html',
-    checkboxes: 'directives/decorators/bootstrap/checkboxes.html',
-    number: 'directives/decorators/bootstrap/default.html',
-    submit: 'directives/decorators/bootstrap/submit.html',
-    'default': 'directives/decorators/bootstrap/default.html'
+  decoratorsProvider.createDecorator('bootstrapDecorator',{
+    textarea: base+'textarea.html',
+    fieldset: base+'fieldset.html',
+    section: base+'section.html',
+    actions: base+'actions.html',
+    select: base+'select.html',
+    checkbox: base+'checkbox.html',
+    checkboxes: base+'checkboxes.html',
+    number: base+'default.html',
+    submit: base+'submit.html',
+    button: base+'submit.html',
+    'default': base+'default.html'
   },[
     function(form){
       if (form.readonly && form.key && form.type !== 'fieldset') {
-        return 'directives/decorators/bootstrap/readonly.html';
+        return base+'readonly.html';
       }
     }
   ]);
 
-}]);
+  //manual use directives
+  decoratorsProvider.createDirectives({
+    textarea: base+'textarea.html',
+    select: base+'select.html',
+    checkbox: base+'checkbox.html',
+    checkboxes: base+'checkboxes.html',
+    number: base+'default.html',
+    submit: base+'submit.html',
+    button: base+'submit.html',
+    text: base+'default.html',
+    date: base+'default.html',
+    password: base+'default.html',
+    input: base+'default.html'
+  });
+
+}]).directive('sfFieldset',function(){
+  return {
+    transclude: true,
+    scope: true,
+    templateUrl: 'directives/decorators/bootstrap/fieldset-trcl.html',
+    link: function(scope,element,attrs) {
+      scope.title = scope.$eval(attrs.title);
+    }
+  };
+});
 
 
 
diff --git a/src/directives/decorators/bootstrap/default.html b/src/directives/decorators/bootstrap/default.html
index 9600587a1..704c6001d 100644
--- a/src/directives/decorators/bootstrap/default.html
+++ b/src/directives/decorators/bootstrap/default.html
@@ -1,13 +1,13 @@
 <div class="form-group" ng-class="{'has-error': hasError()}">
   <label ng-show="showTitle()">{{form.title}}</label>
 
-  <input type="{{form.type}}"
+  <input ng-show="form.key"
+         type="{{form.type}}"
          placeholder="{{form.placeholder}}"
          class="form-control"
          ng-required="form.required"
          ng-model="$$value$$"
          schema-validate="form.schema">
 
-  <span class="help-block" ng-show="form.description && !hasError()">{{form.description}} </span>
-  <span class="help-block" ng-show="hasError()">{{schemaError}}</span>
+  <span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span>
 </div>
\ No newline at end of file
diff --git a/src/directives/decorators/bootstrap/fieldset-trcl.html b/src/directives/decorators/bootstrap/fieldset-trcl.html
new file mode 100644
index 000000000..5dacedb92
--- /dev/null
+++ b/src/directives/decorators/bootstrap/fieldset-trcl.html
@@ -0,0 +1,4 @@
+<fieldset ng-disabled="form.readonly">
+  <legend ng-show="form.title">{{ form.title }}</legend>
+  <div ng-transclude></div>
+</fieldset>
\ No newline at end of file
diff --git a/src/directives/decorators/bootstrap/fieldset.html b/src/directives/decorators/bootstrap/fieldset.html
index a3cc6bf86..1f4ebd19f 100644
--- a/src/directives/decorators/bootstrap/fieldset.html
+++ b/src/directives/decorators/bootstrap/fieldset.html
@@ -1,4 +1,4 @@
 <fieldset ng-disabled="form.readonly">
   <legend ng-show="form.title">{{ form.title }}</legend>
-  <bootstrap-decorator ng-repeat="item in form.items" form="item"></bootstrap-decorator>
+  <sf-decorator ng-repeat="item in form.items" form="item"></sf-decorator>
 </fieldset>
\ No newline at end of file
diff --git a/src/directives/decorators/bootstrap/select.html b/src/directives/decorators/bootstrap/select.html
index 11681c309..67f5b7565 100644
--- a/src/directives/decorators/bootstrap/select.html
+++ b/src/directives/decorators/bootstrap/select.html
@@ -8,6 +8,5 @@
           ng-required="form.required"
           ng-options="val as name for (val,name) in form.titleMap">
   </select>
-  <span class="help-block" ng-show="form.description && !hasError()">{{form.description}}</span>
-  <span class="help-block" ng-show="hasError()">{{schemaError}}</span>
+  <span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}} </span>
 </div>
\ No newline at end of file
diff --git a/src/directives/decorators/bootstrap/submit.html b/src/directives/decorators/bootstrap/submit.html
index 697439576..3c7dab2bc 100644
--- a/src/directives/decorators/bootstrap/submit.html
+++ b/src/directives/decorators/bootstrap/submit.html
@@ -1,3 +1,10 @@
 <div class="form-group">
-  <input type="submit" class="btn btn-primary" value="{{form.title}}">
+  <input type="submit"
+         class="btn btn-primary"
+         value="{{form.title}}"
+         ng-if="form.type === 'submit'">
+  <button class="btn btn-default"
+          type="button"
+          ng-click="buttonClick($event,form)"
+          ng-if="form.type !== 'submit'">{{form.title}}</button>
 </div>
\ No newline at end of file
diff --git a/src/directives/decorators/bootstrap/textarea.html b/src/directives/decorators/bootstrap/textarea.html
index 1c8fc3729..035d8d55a 100644
--- a/src/directives/decorators/bootstrap/textarea.html
+++ b/src/directives/decorators/bootstrap/textarea.html
@@ -5,6 +5,5 @@
             ng-model="$$value$$"
             schema-validate="form.schema"></textarea>
 
-  <span class="help-block" ng-show="form.description && !hasError()">{{form.description}} </span>
-  <span class="help-block" ng-show="hasError()">{{schemaError}} {{ngModel.$error}}</span>
+  <span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}} </span>
 </div>
\ No newline at end of file
diff --git a/src/directives/schema-form.js b/src/directives/schema-form.js
index 0f964850b..4f4496b52 100644
--- a/src/directives/schema-form.js
+++ b/src/directives/schema-form.js
@@ -32,6 +32,11 @@ function($compile,  schemaForm,  schemaFormDecorators){
       initialForm: '=sfForm',
       model: '=sfModel'
     },
+    controller: ['$scope',function($scope){
+      this.evalInParentScope = function(expr,locals){
+        $scope.$parent.$eval(expr,locals);
+      };
+    }],
     replace: false,
     restrict: "A",
     transclude: true,
diff --git a/src/directives/schema-validate.js b/src/directives/schema-validate.js
index 595b4a390..373670872 100644
--- a/src/directives/schema-validate.js
+++ b/src/directives/schema-validate.js
@@ -6,6 +6,7 @@ angular.module('schemaForm').directive('schemaValidate',function(){
     require: 'ngModel',
     link: function(scope,element,attrs,ngModel) {
       scope.ngModel = ngModel;
+      var error = null;
       var schema  = scope.$eval(attrs.schemaValidate);
 
       ngModel.$parsers.unshift(function(viewValue) {
@@ -13,6 +14,11 @@ angular.module('schemaForm').directive('schemaValidate',function(){
           schema = scope.$eval(attrs.schemaValidate);
         }
 
+        //Still might be undefined, especially if form has no schema...
+        if (!schema) {
+          return viewValue;
+        }
+
         //required is handled by ng-required
         if (angular.isUndefined(viewValue)) {
           return undefined;
@@ -38,11 +44,12 @@ angular.module('schemaForm').directive('schemaValidate',function(){
         if (result.valid) {
           // it is valid
           ngModel.$setValidity('schema', true);
+          error = null;
           return viewValue;
         } else {
           // it is invalid, return undefined (no model update)
           ngModel.$setValidity('schema', false);
-          scope.schemaError = result.error.message;
+          error = result.error;
           return undefined;
         }
       });
@@ -52,6 +59,10 @@ angular.module('schemaForm').directive('schemaValidate',function(){
         return scope.ngModel.$invalid && !scope.ngModel.$pristine;
       };
 
+      scope.schemaError = function() {
+        return error;
+      };
+
     }
   };
 });
\ No newline at end of file
diff --git a/src/field-example.html b/src/field-example.html
new file mode 100644
index 000000000..a349ace14
--- /dev/null
+++ b/src/field-example.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html ng-app="test">
+<head>
+  <title>Boostrap Schema Form example</title>
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+  <style type="text/css">
+
+  body,html {
+    min-height: 1400px;
+  }
+
+  .red {
+    border: 1px solid red;
+    background: #fee;
+  }
+
+  </style>
+</head>
+<body ng-controller="TestCtrl">
+
+<div class="col-md-12">
+  <h1>Field Example</h1>
+
+  <div class="col-sm-12">
+    <form name="ngform">
+      <sf-fieldset title="Hardcoded Example">
+        <sf-text  title="Name"
+                  key="name"
+                  model="person"
+                  description="Anything but Sue"
+                  schema="{ type: 'string', minLength: 3}"
+                  placeholder="Your name please"></sf-text>
+
+        <sf-select title="Taste" title-map="titles" key="taste" model="person"></sf-select>
+
+        <!-- actions is a special case that can't be easily hardcoded -->
+        <sf-decorator form="{
+                              type: 'actions',
+                              items: [
+                                { type: 'submit', title: 'Ok'},
+                                { type: 'button', title: 'cancel'}
+                              ]}"></sf-decorator>
+
+      </sf-fieldset>
+    </form>
+    <h3>Model</h3>
+    <pre>{{pretty()}}</pre>
+  </div>
+
+  </div>
+</div>
+<script type="text/javascript" src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
+<script type="text/javascript" src="../bower_components/tv4/tv4.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.14/angular.min.js"></script>
+<script type="text/javascript" src="module.js"></script>
+<script type="text/javascript" src="services/schema-form.js"></script>
+<script type="text/javascript" src="services/decorators.js"></script>
+<script type="text/javascript" src="directives/decorators/bootstrap/bootstrap-decorator.js"></script>
+<script type="text/javascript" src="directives/schema-form.js"></script>
+<script type="text/javascript" src="directives/schema-validate.js"></script>
+<script type="text/javascript">
+
+angular.module('test',['schemaForm']);
+
+function TestCtrl($scope){
+  $scope.person = { taste: 'NaN' };
+  $scope.pretty = function(){
+    return JSON.stringify($scope.person,undefined,2,2);
+  };
+
+  $scope.titles = {
+    'NaN': 'Not a freaking number',
+    'undefind': 'Just not defined',
+    'null': 'Brainfart'
+  };
+}
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/services/decorators.js b/src/services/decorators.js
index 540eb00a2..002246cce 100644
--- a/src/services/decorators.js
+++ b/src/services/decorators.js
@@ -38,11 +38,11 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
           replace: true,
           transclude: false,
           scope: true,
-          link: function(scope,element,attrs) {
+          require: '?^sfSchema',
+          link: function(scope,element,attrs,sfSchema) {
             //rebind our part of the form to the scope.
             var once = scope.$watch(attrs.form,function(form){
 
-
               if (form) {
                 scope.form  = form;
 
@@ -51,7 +51,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
                 //for fieldsets to recurse properly.
                 var url = templateUrl(name,form);
                 $http.get(url,{ cache: $templateCache }).then(function(res){
-                  var template = res.data.replace(/\$\$value\$\$/g,'model.'+form.key);
+                  var template = res.data.replace(/\$\$value\$\$/g,'model.'+(form.key || ""));
                   $compile(template)(scope,function(clone){
                     element.replaceWith(clone);
                   });
@@ -74,29 +74,125 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
               });
               return lst;
             };
+
+            scope.buttonClick = function($event,form) {
+              if (angular.isFunction(form.onClick)) {
+                form.onClick($event,form);
+              } else if (angular.isString(form.onClick)) {
+                if (sfSchema) {
+                  //evaluating in scope outside of sfSchemas isolated scope
+                  sfSchema.evalInParentScope(form.onClick,{'$event':$event,form:form});
+                } else {
+                  scope.$eval(form.onClick,{'$event':$event,form:form});
+                }
+              }
+            };
+
+            /**
+             * Error message handler
+             * An error can either be a schema validation message or a angular js validtion
+             * error (i.e. required)
+             */
+            scope.errorMessage = function(schemaError) {
+              //User has supplied validation messages
+              if (scope.form.validationMessage) {
+                if (schemaError) {
+                  if (angular.isString(scope.form.validationMessage)) {
+                    return scope.form.validationMessage;
+                  }
+
+                  return scope.form.validationMessage[schemaError.code] || scope.form.validationMessage['default'];
+                } else {
+                  return scope.form.validationMessage.required || scope.form.validationMessage['default'] || scope.form.validationMessage;
+                }
+              }
+
+              //No user supplied validation message.
+              if (schemaError) {
+                return schemaError.message; //use tv4.js validation message
+              }
+
+              //Otherwise we only use required so it must be it.
+              return "Required";
+
+            };
           }
         };
       }]);
   };
 
+  var createManualDirective = function(type,templateUrl,transclude) {
+    transclude = angular.isDefined(transclude)? transclude : false;
+    $compileProvider.directive('sf'+angular.uppercase(type[0])+type.substr(1), function(){
+      return {
+        restrict: "EAC",
+        scope: true,
+        replace: true,
+        transclude: transclude,
+        template: '<sf-decorator form="form"></sf-decorator>',
+        link: function(scope,element,attrs) {
+          var watchThis = {
+            'items': 'c',
+            'titleMap': 'c',
+            'schema': 'c'
+          };
+          var form = { type: type };
+          var once = true;
+          angular.forEach(attrs,function(value,name){
+            if (name[0] !== '$' && name.indexOf('ng') !== 0 && name !== 'sfField') {
+
+              var updateForm = function(val){
+                if (angular.isDefined(val) && val !== form[name]) {
+                  form[name] = val;
+
+                  //when we have type, and if specified key we apply it on scope.
+                  if (once && form.type && (form.key || angular.isUndefined(attrs.key))) {
+                    scope.form = form;
+                    once = false;
+                  }
+                }
+              };
+
+              if (name === 'model') {
+                //"model" is bound to scope under the name "model" since this is what the decorators
+                //know and love.
+                scope.$watch(value,function(val){
+                  if (val && scope.model !== val) {
+                    scope.model = val;
+                  }
+                });
+              } else if (watchThis[name] === 'c') {
+                //watch collection
+                scope.$watchCollection(value,updateForm);
+              } else {
+                //$observe
+                attrs.$observe(name,updateForm);
+              }
+            }
+          });
+        }
+      };
+    });
+  };
+
+
+
   /**
-   * Create a decorator directive
+   * Create a decorator directive and its sibling "manual" use directives.
    * The directive can be used to create form fields or other form entities.
    * It can be used in conjunction with <schema-form> directive in which case the decorator is
    * given it's configuration via a the "form" attribute.
    *
-   * ex. Basic usage with form and schema
-   *   <sf-decorator form="myform" schema="myschema"></sf-decorator>
-   *
-   * ex. "Manual" usage
-   *   <sf-decorator sf-type="" sf-title=""
+   * ex. Basic usage
+   *   <sf-decorator form="myform"></sf-decorator>
+   **
    * @param {string} name directive name (CamelCased)
    * @param {Object} mappings, an object that maps "type" => "templateUrl"
    * @param {Array}  rules (optional) a list of functions, function(form){}, that are each tried in turn,
    *                 if they return a string then that is used as the templateUrl. Rules come before
    *                 mappings.
    */
-  this.create = function(name,mappings,rules){
+  this.createDecorator = function(name,mappings,rules){
     directives[name] = {
       mappings: mappings || {},
       rules:    rules    || []
@@ -108,6 +204,30 @@ angular.module('schemaForm').provider('schemaFormDecorators',['$compileProvider'
     createDirective(name);
   };
 
+  /**
+   * Creates a directive of a decorator
+   * Usable when you want to use the decorators without using <schema-form> directive.
+   * Specifically when you need to reuse styling.
+   *
+   * ex. createDirective('text','...')
+   *  <sf-text title="foobar" model="person" key="name" schema="schema"></sf-text>
+   *
+   * @param {string}  type The type of the directive, resulting directive will have sf- prefixed
+   * @param {string}  templateUrl
+   * @param {boolean} transclude (optional) sets transclude option of directive, defaults to false.
+   */
+  this.createDirective = createManualDirective;
+
+  /**
+   * Same as createDirective, but takes an object where key is 'type' and value is 'templateUrl'
+   * Useful for batching.
+   * @param {Object} mappings
+   */
+  this.createDirectives = function(mappings) {
+    angular.forEach(mappings,function(url,type){
+      createManualDirective(type,url);
+    });
+  };
 
   /**
    * Getter for directive mappings
diff --git a/src/services/schema-form.js b/src/services/schema-form.js
index 4e8e29bb4..e6f767440 100644
--- a/src/services/schema-form.js
+++ b/src/services/schema-form.js
@@ -30,6 +30,12 @@ angular.module('schemaForm').factory('schemaForm',[function(){
         obj = { key: obj };
       }
 
+      //if it's a type with items, merge 'em!
+      if (obj.items) {
+        obj.items = service.merge(schema,obj.items,ignore);
+      }
+
+
       //extend with std form from schema.
       if (obj.key && lookup[obj.key]) {
         return angular.extend(lookup[obj.key],obj);
@@ -51,6 +57,10 @@ angular.module('schemaForm').factory('schemaForm',[function(){
     if (schema.readOnly || schema.readonly)  f.readonly  = schema.readOnly || schema.readonly;
     if (schema.minimum) f.minimum = schema.minimum + (schema.exclusiveMinimum?1:0);
     if (schema.maximum) f.maximum = schema.maximum - (schema.exclusiveMaximum?1:0);
+
+    //Non standard attributes
+    if (schema.validationMessage) f.validationMessage = schema.validationMessage;
+    if (schema.enumNames) f.titleMap = schema.enumNames;
     f.schema = schema;
     return f;
   };
@@ -104,10 +114,12 @@ angular.module('schemaForm').factory('schemaForm',[function(){
       var f = stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'select';
-      f.titleMap = {};
-      schema.enum.forEach(function(name){
-        f.titleMap[name] = name;
-      });
+      if (!f.titleMap) {
+        f.titleMap = {};
+        schema.enum.forEach(function(name){
+          f.titleMap[name] = name;
+        });
+      }
       options.lookup[options.path] = f;
       return f;
     }
@@ -118,10 +130,12 @@ angular.module('schemaForm').factory('schemaForm',[function(){
       var f = stdFormObj(schema,options);
       f.key  = options.path;
       f.type = 'checkboxes';
-      f.titleMap = {};
-      schema.items.enum.forEach(function(name){
-        f.titleMap[name] = name;
-      });
+      if (!f.titleMap) {
+        f.titleMap = {};
+        schema.items.enum.forEach(function(name){
+          f.titleMap[name] = name;
+        });
+      }
       options.lookup[options.path] = f;
       return f;
     }
@@ -133,6 +147,7 @@ angular.module('schemaForm').factory('schemaForm',[function(){
       var f   = stdFormObj(schema,options);
       f.type  = 'fieldset';
       f.items = [];
+      options.lookup[options.path] = f;
 
       //recurse down into properties
       angular.forEach(schema.properties,function(v,k){
diff --git a/test/schema-form-test.js b/test/schema-form-test.js
index bddf3a846..245ac5c76 100644
--- a/test/schema-form-test.js
+++ b/test/schema-form-test.js
@@ -200,7 +200,35 @@ describe('Schema form',function(){
         tmpl.children().eq(1).children('select').length.should.equal(1);
         tmpl.children().eq(2).find('input').is('input[type=submit]').should.be.true;
         tmpl.children().eq(2).find('input').val().should.be.equal('Okidoki');
+      });
+    });
+
+    it('should handle buttons',function(){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.obj = {};
+
+        scope.schema = exampleSchema;
+
+        scope.form = ["*",{ type: 'button',title: 'Okidoki', onClick: sinon.spy()}];
+
+        var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="obj"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
 
+        tmpl.children().length.should.be.equal(3);
+        tmpl.children().eq(0).is('div.form-group').should.be.true;
+        tmpl.children().eq(0).find('input').is('input[type="text"]').should.be.true;
+        tmpl.children().eq(1).is('div.form-group').should.be.true;
+        tmpl.children().eq(1).children('select').length.should.equal(1);
+        tmpl.children().eq(2).find('button').length.should.be.equal(1);
+        tmpl.children().eq(2).find('button').text().should.be.equal('Okidoki');
+
+        scope.form[1].onClick.should.not.have.beenCalled;
+        tmpl.children().eq(2).find('button').click();
+        scope.form[1].onClick.should.have.beenCalledOnce;
       });
 
     });
@@ -300,6 +328,56 @@ describe('Schema form',function(){
       });
     });
 
+    it('should display custom validationMessages when specified',function(done){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.person = {};
+
+        scope.schema = {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string",
+              "pattern": "^[a-z]+",
+              "validationMessage": "You are only allowed lower case letters in name."
+            },
+            "nick": {
+              "type": "string",
+              "pattern": "^[a-z]+",
+            },
+          }
+        };
+
+        scope.form = [
+          "name",
+          {
+            key: 'nick',
+            validationMessage: 'Foobar'
+          }
+        ];
+
+        var tmpl = angular.element('<form name="theform" sf-schema="schema" sf-form="form" sf-model="person"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
+        tmpl.find('input').each(function(){
+          $(this).scope().ngModel.$setViewValue('AÖ');
+        });
+
+        var errors = tmpl.find('.help-block');
+
+        //timeout so we can do a second $apply
+        setTimeout(function(){
+          $rootScope.$apply(); //this actually updates the view with error messages
+          errors.eq(0).text().should.be.equal("You are only allowed lower case letters in name.");
+          errors.eq(1).text().should.be.equal("Foobar");
+          done();
+        },0);
+
+      });
+    });
+
 
     it('should use ng-required on required fields',function(){
 
@@ -440,6 +518,65 @@ describe('Schema form',function(){
       });
     });
 
+    it('should handle schema form defaults in deep structure',function(){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.person = {
+          name: 'Foobar'
+        };
+
+        scope.schema = {
+          "type": "object",
+          "properties": {
+            "props" : {
+              "type": "object",
+              "title": "Person",
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "title": "Name"
+                },
+                "nick": {
+                  "type": "string",
+                  "title": "Nick"
+                },
+                "alias": {
+                  "type": "string",
+                  "title": "Alias"
+                }
+              }
+            }
+          }
+        };
+
+        //The form defines a fieldset for person, and changes the order of fields
+        //but titles should come from the schema
+        scope.form = [{
+          type: 'fieldset',
+          key:  'props',
+          items: [
+            'props.nick',
+            'props.name',
+            'props.alias'
+          ]
+        }];
+
+        var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="person"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
+
+        tmpl.children().length.should.be.eq(1);
+        var labels = tmpl.children().children().find('label');
+        labels.eq(0).text().should.equal('Nick');
+        labels.eq(1).text().should.equal('Name');
+        labels.eq(2).text().should.equal('Alias');
+
+      });
+    });
+
+
     it('should skip title if form says "notitle"',function(){
 
       inject(function($compile,$rootScope){
@@ -775,9 +912,9 @@ describe('Schema form',function(){
   });
 
   describe('decorator factory service',function(){
-    it.only('should enable you to create new decorator directives',function(){
+    it('should enable you to create new decorator directives',function(){
       module(function(schemaFormDecoratorsProvider){
-        schemaFormDecoratorsProvider.create('foobar',{ 'foo':'/bar.html' },[angular.noop]);
+        schemaFormDecoratorsProvider.createDecorator('foobar',{ 'foo':'/bar.html' },[angular.noop]);
       });
 
       inject(function($rootScope,$compile,$templateCache){